From 171560c6883c510e0be6d9d4646fb211f88a49c9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 10:54:44 +0000
Subject: [PATCH 01/53] chore(deps): update docker/build-push-action action to
 v6

---
 .github/workflows/master.yml  | 4 ++--
 .github/workflows/pr.yml      | 2 +-
 .github/workflows/release.yml | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 4b3e133f..1dbace48 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -24,7 +24,7 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Build Image
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ./Dockerfile
@@ -112,7 +112,7 @@ jobs:
         password: ${{ secrets.CR_PAT }}
 
     - name: Build and Push
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ./Dockerfile
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 3a0f9791..e6db2310 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -24,7 +24,7 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Build and push Dev
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ./Dockerfile
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dbc502fb..a6c77bde 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       uses: docker/setup-buildx-action@v3
 
     - name: Build and push Dev
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ./Dockerfile
@@ -118,7 +118,7 @@ jobs:
         password: ${{ secrets.CR_PAT }}
 
     - name: Build and Push master
-      uses: docker/build-push-action@v5
+      uses: docker/build-push-action@v6
       with:
         context: .
         file: ./Dockerfile

From 45987e8e40b4b1d374653e096673670f4b2aeebc Mon Sep 17 00:00:00 2001
From: reddexx <killmaster-loc@hotmail.de>
Date: Mon, 15 Jul 2024 08:58:33 +0200
Subject: [PATCH 02/53] Update Dockerfile

Update to 24.05.3
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index caaf657b..eae5dc28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=24.05.2
+ENV BOOKSTACK_VERSION=24.05.3
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \

From b7cdb5e33756bfa2c88ae99f91d1f2d887705166 Mon Sep 17 00:00:00 2001
From: andremohr <62677846+andremohr@users.noreply.github.com>
Date: Tue, 23 Jul 2024 15:37:49 +0200
Subject: [PATCH 03/53] fix: correct bookstack version

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7a0b2aa0..3b479668 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.5.2 \
-   solidnerd/bookstack:24.5.2
+   --name bookstack_24.5.3 \
+   solidnerd/bookstack:24.5.3
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.5.2" \
-    solidnerd/bookstack:24.5.2
+   --name="bookstack_24.5.3" \
+    solidnerd/bookstack:24.5.3
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 582c8a58..83fde046 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.5.2
+24.5.3
diff --git a/docker-compose.yml b/docker-compose.yml
index e802ba34..02a98ef9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.5.2
+    image: solidnerd/bookstack:24.5.3
     depends_on:
     - mysql
     environment:

From cf645b8361991a8a5266ef15a0b07b69b08290dd Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Thu, 29 Aug 2024 17:18:44 +0100
Subject: [PATCH 04/53] feat: update to Bookstack 24.05.4

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index eae5dc28..ad09587b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=24.05.3
+ENV BOOKSTACK_VERSION=24.05.4
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \

From c9e4ba55bb9e4b089b12c06564fb1ee3c720afa3 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Thu, 29 Aug 2024 17:22:36 +0100
Subject: [PATCH 05/53] doc: update references to 24.5.4

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3b479668..8cc39e55 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.5.3 \
-   solidnerd/bookstack:24.5.3
+   --name bookstack_24.5.4 \
+   solidnerd/bookstack:24.5.4
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.5.3" \
-    solidnerd/bookstack:24.5.3
+   --name="bookstack_24.5.4" \
+    solidnerd/bookstack:24.5.4
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 83fde046..7d66b9a5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.5.3
+24.5.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 02a98ef9..8f03a1b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.5.3
+    image: solidnerd/bookstack:24.5.4
     depends_on:
     - mysql
     environment:

From aa520092491b1d1988d246bfac64f1626802abba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Mohr?=
 <62677846+andremohr@users.noreply.github.com>
Date: Wed, 9 Oct 2024 14:09:05 +0200
Subject: [PATCH 06/53] feat: update to Bookstack 24.10

---
 Dockerfile         | 2 +-
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ad09587b..96891501 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=24.05.4
+ENV BOOKSTACK_VERSION=24.10
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \
diff --git a/README.md b/README.md
index 8cc39e55..7765d09c 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.5.4 \
-   solidnerd/bookstack:24.5.4
+   --name bookstack_24.10.0 \
+   solidnerd/bookstack:24.10.0
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.5.4" \
-    solidnerd/bookstack:24.5.4
+   --name="bookstack_24.10.0" \
+    solidnerd/bookstack:24.10.0
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 7d66b9a5..21651351 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.5.4
+24.10.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 8f03a1b8..76d72e3b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.5.4
+    image: solidnerd/bookstack:24.10.0
     depends_on:
     - mysql
     environment:

From ae10647dd0358f676e646dffd9d106489bbd3190 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 16:27:30 +0000
Subject: [PATCH 07/53] chore(deps): update actions/checkout digest to 11bd719

---
 .github/workflows/master.yml  | 6 +++---
 .github/workflows/pr.yml      | 4 ++--
 .github/workflows/release.yml | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 1dbace48..5f0afa52 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
     - name: Set up CI Image Metadata
       id: docker_meta_ci
@@ -48,7 +48,7 @@ jobs:
     needs: build
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
     - name: Download artifact
       uses: actions/download-artifact@v4
@@ -66,7 +66,7 @@ jobs:
     needs: e2e
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
     - name:  Set up Docker Hub Image Metadata
       id: docker_meta
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index e6db2310..d1bf1e42 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
     - name: Docker meta ci
       id: docker_meta_ci
@@ -49,7 +49,7 @@ jobs:
     needs: build
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
     - name: Download artifact
       uses: actions/download-artifact@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a6c77bde..3ad0b3cd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
     - name: Set up CI Image Metadata
       id: docker_meta_ci
@@ -47,7 +47,7 @@ jobs:
     needs: build
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
     - name: Download artifact
       uses: actions/download-artifact@v4
@@ -65,7 +65,7 @@ jobs:
     needs: e2e
     steps:
     - name: Checkout
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
     - name:  Set up Docker Hub Image Metadata
       id: docker_meta
@@ -136,7 +136,7 @@ jobs:
     steps:
       # To use this repository's private action, you must check out the repository
       - name: Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
 
       - name: Generate changelog
         id: changelog

From 34fefb1e1e6c30a06609937ab38481ce49826bda Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 14:04:39 +0000
Subject: [PATCH 08/53] chore(deps): update dependency ubuntu to v24

---
 .github/workflows/master.yml  | 2 +-
 .github/workflows/release.yml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 5f0afa52..aa4dcbcf 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -62,7 +62,7 @@ jobs:
         docker image ls -a
 
   push:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: e2e
     steps:
     - name: Checkout
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ad0b3cd..e7448e64 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
         docker image ls -a
 
   push:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: e2e
     steps:
     - name: Checkout
@@ -131,7 +131,7 @@ jobs:
         cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
 
   create-release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: push
     steps:
       # To use this repository's private action, you must check out the repository

From 5e35db84a6d6befcecd1eb75b393d0e403c9b2d4 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Fri, 8 Nov 2024 14:05:47 +0000
Subject: [PATCH 09/53] feat: Update Bookstack to version 24.10.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 96891501..fb96a2cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=24.10
+ENV BOOKSTACK_VERSION=24.10.1
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \

From caa3dfab1b68100a58cd27ef47d0b85980c39dfe Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Fri, 8 Nov 2024 14:13:30 +0000
Subject: [PATCH 10/53] doc: update references to version 24.10.1

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 7765d09c..312ca5f6 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.10.0 \
-   solidnerd/bookstack:24.10.0
+   --name bookstack_24.10.1 \
+   solidnerd/bookstack:24.10.1
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.10.0" \
-    solidnerd/bookstack:24.10.0
+   --name="bookstack_24.10.1" \
+    solidnerd/bookstack:24.10.1
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 21651351..169a8dd8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.10.0
+24.10.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 76d72e3b..38d6c972 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.10.0
+    image: solidnerd/bookstack:24.10.1
     depends_on:
     - mysql
     environment:

From 75b04db6b8e0601c6709c634d4cae6dcf9881af3 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Fri, 8 Nov 2024 14:35:48 +0000
Subject: [PATCH 11/53] lint: match case for 'FROM' and 'AS' in Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fb96a2cb..1d3551f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3 as bookstack
+FROM alpine:3 AS bookstack
 ENV BOOKSTACK_VERSION=24.10.1
 RUN apk add --no-cache curl tar
 RUN set -x; \
@@ -7,7 +7,7 @@ RUN set -x; \
     && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \
     && rm bookstack.tar.gz
 
-FROM php:8.3-apache-bookworm as final
+FROM php:8.3-apache-bookworm AS final
 RUN set -x; \
     apt-get update \
     && apt-get install -y --no-install-recommends \

From 6177d49bf21fde204f751a190010678d5042eedf Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Fri, 8 Nov 2024 14:46:55 +0000
Subject: [PATCH 12/53] ci: switch to docker compose from docker-compose

---
 Makefile  | 6 +++---
 README.md | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c5a00a55..ded68cbf 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ push-release:
 
 
 e2e:
-	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml up -d
-	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml run --rm sut
-	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml down -v
+	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker compose -f docker-compose.test.yml up -d
+	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker compose -f docker-compose.test.yml run --rm sut
+	@BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker compose -f docker-compose.test.yml down -v
 
diff --git a/README.md b/README.md
index 312ca5f6..5b5fa242 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ In 0.12.2 we removed `DB_PORT` . You can now specify the port via `DB_HOST` like
 With Docker Compose is a Quickstart very easy. Run the following command:
 
 ```bash
-docker-compose up
+docker compose up
 ```
 
 and after that open your Browser and go to

From a728c658db0b7ebbfc12d6146c2f55e4fbdf0594 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Wed, 13 Nov 2024 13:03:32 +0000
Subject: [PATCH 13/53] feat: update Dockerfile to use Bookstack v24.10.2

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 1d3551f7..05168b47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=24.10.1
+ENV BOOKSTACK_VERSION=24.10.2
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \

From d94590fd94b031bbbfdf609e192ca5b35076a66c Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Wed, 13 Nov 2024 13:09:09 +0000
Subject: [PATCH 14/53] doc: update documentation to use 24.10.2

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 5b5fa242..044cbc86 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.10.1 \
-   solidnerd/bookstack:24.10.1
+   --name bookstack_24.10.2 \
+   solidnerd/bookstack:24.10.2
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.10.1" \
-    solidnerd/bookstack:24.10.1
+   --name="bookstack_24.10.2" \
+    solidnerd/bookstack:24.10.2
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 169a8dd8..95795064 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.10.1
+24.10.2
diff --git a/docker-compose.yml b/docker-compose.yml
index 38d6c972..7dc7ecca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.10.1
+    image: solidnerd/bookstack:24.10.2
     depends_on:
     - mysql
     environment:

From 483baebe7a6b9f0a7d4285d1541c0f95749dbfa6 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Thu, 13 Jun 2024 16:14:23 +0100
Subject: [PATCH 15/53] refactor: use true tag name for BOOKSTACK_VERSION

This allows the latest tag to be fetched from GitHub's API and used
directly, instead of requiring parsing.
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 05168b47..fe60b0c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=24.10.2
+ENV BOOKSTACK_VERSION=v24.10.2
 RUN apk add --no-cache curl tar
 RUN set -x; \
-    curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \
+    curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \
     && mkdir -p /bookstack \
     && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \
     && rm bookstack.tar.gz

From c37d6b8a87b13c23473d39e9485b1366d070d0ba Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Thu, 13 Jun 2024 16:16:44 +0100
Subject: [PATCH 16/53] feat: create script to update Dockerfile

---
 scripts/update_dockerfile.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 scripts/update_dockerfile.sh

diff --git a/scripts/update_dockerfile.sh b/scripts/update_dockerfile.sh
new file mode 100755
index 00000000..32c93b60
--- /dev/null
+++ b/scripts/update_dockerfile.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+BOOKSTACK_VERSION=$(curl -L \
+  -H "Accept: application/vnd.github+json" \
+  -H "X-GitHub-Api-Version: 2022-11-28" \
+  https://api.github.com/repos/BookstackApp/Bookstack/releases/latest | \
+  jq -r .tag_name
+)
+
+echo "Latest: ${BOOKSTACK_VERSION}. Updating.."
+
+sed \
+  -i '' \
+  -e "s/^ENV BOOKSTACK_VERSION=.*/ENV BOOKSTACK_VERSION=${BOOKSTACK_VERSION}/" \
+  Dockerfile

From 31d55d7f9960de66ff0356e4b581384aac139ccb Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Thu, 13 Jun 2024 16:58:12 +0100
Subject: [PATCH 17/53] feat: start adding tags with new versions

---
 scripts/update_dockerfile.sh    | 13 +++++++++++--
 scripts/update_tags_and_docs.sh | 30 ++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100755 scripts/update_tags_and_docs.sh

diff --git a/scripts/update_dockerfile.sh b/scripts/update_dockerfile.sh
index 32c93b60..e203e0ff 100755
--- a/scripts/update_dockerfile.sh
+++ b/scripts/update_dockerfile.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+echo "Fetching latest Bookstack release from GitHub API"
+
 BOOKSTACK_VERSION=$(curl -L \
   -H "Accept: application/vnd.github+json" \
   -H "X-GitHub-Api-Version: 2022-11-28" \
@@ -7,9 +9,16 @@ BOOKSTACK_VERSION=$(curl -L \
   jq -r .tag_name
 )
 
-echo "Latest: ${BOOKSTACK_VERSION}. Updating.."
+echo "Found latest version: ${BOOKSTACK_VERSION}"
+
+# Get the root of the Git repository in order to correctly path e.g. Dockerfile
+GIT_ROOT=$(git rev-parse --show-toplevel)
 
+echo "Updating Dockerfile.."
 sed \
   -i '' \
   -e "s/^ENV BOOKSTACK_VERSION=.*/ENV BOOKSTACK_VERSION=${BOOKSTACK_VERSION}/" \
-  Dockerfile
+  "${GIT_ROOT}/Dockerfile"
+
+git add "${GIT_ROOT}/Dockerfile"
+git commit -S -m "feat: update Dockerfile to use Bookstack ${BOOKSTACK_VERSION}"
diff --git a/scripts/update_tags_and_docs.sh b/scripts/update_tags_and_docs.sh
new file mode 100755
index 00000000..a090452c
--- /dev/null
+++ b/scripts/update_tags_and_docs.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# Get the root of the Git repository in order to correctly path e.g. Dockerfile
+GIT_ROOT=$(git rev-parse --show-toplevel)
+
+# Extract the version from the Dockerfile, as there could have been a new
+# release since the last run.
+
+BOOKSTACK_VERSION=$(awk \
+  '/ENV BOOKSTACK_VERSION/{split($2,b,"="); print b[2]}' \
+  "${GIT_ROOT}/Dockerfile"
+)
+
+echo "Extracted version: ${BOOKSTACK_VERSION}"
+
+# Remove the 'v' for our tags
+BOOKSTACK_VERSION="${BOOKSTACK_VERSION/#v/}"
+# Remove leading zeros to make the version fit a SemVer-shaped hole
+BOOKSTACK_VERSION="${BOOKSTACK_VERSION/.0/.}"
+# And again for patch version, just in case
+BOOKSTACK_VERSION="${BOOKSTACK_VERSION/.0/.}"
+
+echo "Tag name: ${BOOKSTACK_VERSION}"
+
+git tag -s -a "${BOOKSTACK_VERSION}" -m "Release version ${BOOKSTACK_VERSION}"
+git push --tags
+
+# TODO: Sort VERSION file
+# TODO: Update README version
+# TODO: Update docker-compose

From 9a4aa4533921f2acf05e8b4b838c3ee225483a6b Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Fri, 8 Nov 2024 14:34:30 +0000
Subject: [PATCH 18/53] doc: use update script in release doc

---
 RELEASE.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/RELEASE.md b/RELEASE.md
index 9b5e98d8..0db7ced4 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -4,6 +4,20 @@ When the version changes, a new release should be cut. To do this, push a tag
 with the [valid SemVer][semver-checker] version number as the tag.
 It may also be useful to update documentation references at the same time.
 
+## Scripts
+
+Update the Dockerfile with:
+
+```shell
+$ scripts/update_dockerfile.sh
+Fetching latest Bookstack release from GitHub API
+  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+                                 Dload  Upload   Total   Spent    Left  Speed
+100  3467  100  3467    0     0  18743      0 --:--:-- --:--:-- --:--:-- 18842
+Found latest version: v24.10.1
+Updating Dockerfile..
+```
+
 ## Example
 
 For Bookstack version 23.01:

From e64ed8397e04aa2fee023f198e64ef21d765d9f1 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Wed, 13 Nov 2024 13:29:05 +0000
Subject: [PATCH 19/53] feat: update documentation in release scripts

---
 scripts/update_tags_and_docs.sh | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/scripts/update_tags_and_docs.sh b/scripts/update_tags_and_docs.sh
index a090452c..1d4afccf 100755
--- a/scripts/update_tags_and_docs.sh
+++ b/scripts/update_tags_and_docs.sh
@@ -25,6 +25,23 @@ echo "Tag name: ${BOOKSTACK_VERSION}"
 git tag -s -a "${BOOKSTACK_VERSION}" -m "Release version ${BOOKSTACK_VERSION}"
 git push --tags
 
-# TODO: Sort VERSION file
-# TODO: Update README version
-# TODO: Update docker-compose
+echo "Extracting old version info.."
+OLD_BS_VERSION="$(cat VERSION)"
+
+echo "Updating README and reference docker-compose.yml.."
+sed \
+  -i '' \
+  -e "s/${OLD_BS_VERSION}/${BOOKSTACK_VERSION}/g" \
+  "${GIT_ROOT}/README.md" \
+  "${GIT_ROOT}/docker-compose.yml"
+
+echo "Updating VERSION file.."
+echo "${BOOKSTACK_VERSION}" > "${GIT_ROOT}/VERSION"
+
+git add \
+  "${GIT_ROOT}/README.md" \
+  "${GIT_ROOT}/docker-compose.yml" \
+  "${GIT_ROOT}/VERSION"
+
+git commit -S -m "doc: update documentation to reference ${BOOKSTACK_VERSION}"
+git push

From dfecafcbb5e8084fb6997113c35bfa8f1c70b4ff Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Sat, 30 Nov 2024 01:14:12 +0000
Subject: [PATCH 20/53] feat: update Dockerfile to use Bookstack v24.10.3

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index fe60b0c4..645f89da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v24.10.2
+ENV BOOKSTACK_VERSION=v24.10.3
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \

From 7095a1a7ce9ab0d30cc4af6a17344e0174f2f4e3 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Sat, 30 Nov 2024 01:20:42 +0000
Subject: [PATCH 21/53] doc: update documentation to reference 24.10.3

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 044cbc86..f1bd3b94 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.10.2 \
-   solidnerd/bookstack:24.10.2
+   --name bookstack_24.10.3 \
+   solidnerd/bookstack:24.10.3
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.10.2" \
-    solidnerd/bookstack:24.10.2
+   --name="bookstack_24.10.3" \
+    solidnerd/bookstack:24.10.3
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 95795064..7c77343c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.10.2
+24.10.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 7dc7ecca..27bcc56b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.10.2
+    image: solidnerd/bookstack:24.10.3
     depends_on:
     - mysql
     environment:

From 0eb2ff92e5cfcff08846b29d33b6946177e92ae8 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Mon, 23 Dec 2024 12:59:49 +0000
Subject: [PATCH 22/53] feat: update Dockerfile to use Bookstack v24.12

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 645f89da..e0d0e7bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v24.10.3
+ENV BOOKSTACK_VERSION=v24.12
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \

From 08b034ea6d640e5916fc440d89fa057214db086e Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Mon, 23 Dec 2024 13:01:28 +0000
Subject: [PATCH 23/53] doc: update documentation to reference 24.12

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f1bd3b94..47e146e5 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.10.3 \
-   solidnerd/bookstack:24.10.3
+   --name bookstack_24.12 \
+   solidnerd/bookstack:24.12
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.10.3" \
-    solidnerd/bookstack:24.10.3
+   --name="bookstack_24.12" \
+    solidnerd/bookstack:24.12
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 7c77343c..b0195acf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.10.3
+24.12
diff --git a/docker-compose.yml b/docker-compose.yml
index 27bcc56b..9ec3b0ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.10.3
+    image: solidnerd/bookstack:24.12
     depends_on:
     - mysql
     environment:

From e0bde33a5cbcba3805a463b0e779861d2f41742d Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Mon, 23 Dec 2024 13:04:58 +0000
Subject: [PATCH 24/53] Revert "doc: update documentation to reference 24.12"

This reverts commit 08b034ea6d640e5916fc440d89fa057214db086e.
---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 47e146e5..f1bd3b94 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.12 \
-   solidnerd/bookstack:24.12
+   --name bookstack_24.10.3 \
+   solidnerd/bookstack:24.10.3
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.12" \
-    solidnerd/bookstack:24.12
+   --name="bookstack_24.10.3" \
+    solidnerd/bookstack:24.10.3
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index b0195acf..7c77343c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.12
+24.10.3
diff --git a/docker-compose.yml b/docker-compose.yml
index 9ec3b0ab..27bcc56b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.12
+    image: solidnerd/bookstack:24.10.3
     depends_on:
     - mysql
     environment:

From 67a8948780aa825557166f0642c8066af7064110 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Mon, 23 Dec 2024 13:15:05 +0000
Subject: [PATCH 25/53] fix: ensure patch version numbers exist

---
 scripts/update_tags_and_docs.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/update_tags_and_docs.sh b/scripts/update_tags_and_docs.sh
index 1d4afccf..063dd073 100755
--- a/scripts/update_tags_and_docs.sh
+++ b/scripts/update_tags_and_docs.sh
@@ -16,9 +16,14 @@ echo "Extracted version: ${BOOKSTACK_VERSION}"
 # Remove the 'v' for our tags
 BOOKSTACK_VERSION="${BOOKSTACK_VERSION/#v/}"
 # Remove leading zeros to make the version fit a SemVer-shaped hole
-BOOKSTACK_VERSION="${BOOKSTACK_VERSION/.0/.}"
-# And again for patch version, just in case
-BOOKSTACK_VERSION="${BOOKSTACK_VERSION/.0/.}"
+BOOKSTACK_VERSION="${BOOKSTACK_VERSION//.0?/.}"
+
+# If the version only has one decimal dot in it, it doesn't have a patch
+# version and one should be added to ensure semver-shape.
+BS_DECIMALS="${BOOKSTACK_VERSION//[^.]}"
+if [[ "${#BS_DECIMALS}" -eq "1" ]]; then
+  BOOKSTACK_VERSION="${BOOKSTACK_VERSION}.0"
+fi
 
 echo "Tag name: ${BOOKSTACK_VERSION}"
 

From 8b4e65676d6e4491446512ba269976234fe185f3 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Mon, 23 Dec 2024 13:15:15 +0000
Subject: [PATCH 26/53] doc: update documentation to reference 24.12.0

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index f1bd3b94..e5844a33 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.10.3 \
-   solidnerd/bookstack:24.10.3
+   --name bookstack_24.12.0 \
+   solidnerd/bookstack:24.12.0
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.10.3" \
-    solidnerd/bookstack:24.10.3
+   --name="bookstack_24.12.0" \
+    solidnerd/bookstack:24.12.0
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 7c77343c..248216ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.10.3
+24.12.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 27bcc56b..6246d390 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.10.3
+    image: solidnerd/bookstack:24.12.0
     depends_on:
     - mysql
     environment:

From 091295c4c3cf3076d7736c7f5a4c22be483c7791 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Sun, 5 Jan 2025 11:35:22 +0000
Subject: [PATCH 27/53] feat: update Dockerfile to use Bookstack v24.12.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e0d0e7bb..09e6cc77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v24.12
+ENV BOOKSTACK_VERSION=v24.12.1
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \

From a60cedeab11886c9476e7ff716984ad4bb6328da Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Sun, 5 Jan 2025 11:38:53 +0000
Subject: [PATCH 28/53] doc: update documentation to reference 24.12.1

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index e5844a33..4be5d8a5 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.12.0 \
-   solidnerd/bookstack:24.12.0
+   --name bookstack_24.12.1 \
+   solidnerd/bookstack:24.12.1
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.12.0" \
-    solidnerd/bookstack:24.12.0
+   --name="bookstack_24.12.1" \
+    solidnerd/bookstack:24.12.1
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 248216ad..58dde6ec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.12.0
+24.12.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 6246d390..1f6c903d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.12.0
+    image: solidnerd/bookstack:24.12.1
     depends_on:
     - mysql
     environment:

From 40a27d58e162f63142d02d498acb808a39f1cb2e Mon Sep 17 00:00:00 2001
From: Grzegorz Skornowicz <grzegorz@skornowicz.pl>
Date: Tue, 18 Feb 2025 21:02:12 +0100
Subject: [PATCH 29/53] adjust php memory limit

---
 php.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/php.ini b/php.ini
index 8c04c367..3b9c045a 100644
--- a/php.ini
+++ b/php.ini
@@ -1,4 +1,4 @@
 [PHP]
-
+memory_limit = 256M
 post_max_size = 10M
 upload_max_filesize = 10M

From 359b53a83af5f8d97496a02ad2cc07cb9689edd1 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Wed, 26 Feb 2025 15:51:16 +0000
Subject: [PATCH 30/53] feat: update Dockerfile to use Bookstack v25.02

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 09e6cc77..573b7961 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v24.12.1
+ENV BOOKSTACK_VERSION=v25.02
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \

From dd86a9b2e880d632386cbcd83d3c9a8b2b74e1e0 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Wed, 26 Feb 2025 16:03:45 +0000
Subject: [PATCH 31/53] feat: confirm in script whether tag correct

---
 scripts/update_tags_and_docs.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/update_tags_and_docs.sh b/scripts/update_tags_and_docs.sh
index 063dd073..30efd084 100755
--- a/scripts/update_tags_and_docs.sh
+++ b/scripts/update_tags_and_docs.sh
@@ -27,6 +27,13 @@ fi
 
 echo "Tag name: ${BOOKSTACK_VERSION}"
 
+read -p "Is the tag name correct? (y/n)" -n 1 -r
+echo
+if ! [[ "${REPLY}" =~ ^[Yy]$ ]]; then
+  echo "Aborting.."
+  exit 1
+fi
+
 git tag -s -a "${BOOKSTACK_VERSION}" -m "Release version ${BOOKSTACK_VERSION}"
 git push --tags
 

From 4dbbdad124fa70f3d5c2b990a2518d96dbb5e735 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Wed, 26 Feb 2025 16:09:46 +0000
Subject: [PATCH 32/53] fix: correct version matching pattern in tag update
 script

---
 scripts/update_tags_and_docs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_tags_and_docs.sh b/scripts/update_tags_and_docs.sh
index 30efd084..51c8edec 100755
--- a/scripts/update_tags_and_docs.sh
+++ b/scripts/update_tags_and_docs.sh
@@ -16,7 +16,7 @@ echo "Extracted version: ${BOOKSTACK_VERSION}"
 # Remove the 'v' for our tags
 BOOKSTACK_VERSION="${BOOKSTACK_VERSION/#v/}"
 # Remove leading zeros to make the version fit a SemVer-shaped hole
-BOOKSTACK_VERSION="${BOOKSTACK_VERSION//.0?/.}"
+BOOKSTACK_VERSION="${BOOKSTACK_VERSION/.0/.}"
 
 # If the version only has one decimal dot in it, it doesn't have a patch
 # version and one should be added to ensure semver-shape.

From 04c918226124aff261c8ef5902800ca02c77c1c9 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Wed, 26 Feb 2025 16:11:13 +0000
Subject: [PATCH 33/53] doc: update documentation to reference 25.2.0

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 4be5d8a5..243c5612 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_24.12.1 \
-   solidnerd/bookstack:24.12.1
+   --name bookstack_25.2.0 \
+   solidnerd/bookstack:25.2.0
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_24.12.1" \
-    solidnerd/bookstack:24.12.1
+   --name="bookstack_25.2.0" \
+    solidnerd/bookstack:25.2.0
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 58dde6ec..baa90a68 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-24.12.1
+25.2.0
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f6c903d..1b44083b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:24.12.1
+    image: solidnerd/bookstack:25.2.0
     depends_on:
     - mysql
     environment:

From 5eb7a6ccbd402954f8640cdff0c7083ab14ccbad Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Sun, 16 Mar 2025 14:38:18 +0000
Subject: [PATCH 34/53] feat: update Dockerfile to use Bookstack v25.02.1

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 573b7961..8ca0ba91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v25.02
+ENV BOOKSTACK_VERSION=v25.02.1
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \

From bdd0933ea37ab41bcbd35825da179b1c3530e5c0 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Sun, 16 Mar 2025 14:40:25 +0000
Subject: [PATCH 35/53] doc: update documentation to reference 25.2.1

---
 README.md          | 8 ++++----
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 243c5612..52bab784 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_25.2.0 \
-   solidnerd/bookstack:25.2.0
+   --name bookstack_25.2.1 \
+   solidnerd/bookstack:25.2.1
    ```
 
 ### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_25.2.0" \
-    solidnerd/bookstack:25.2.0
+   --name="bookstack_25.2.1" \
+    solidnerd/bookstack:25.2.1
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index baa90a68..5870c667 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-25.2.0
+25.2.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 1b44083b..e733bd0b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:25.2.0
+    image: solidnerd/bookstack:25.2.1
     depends_on:
     - mysql
     environment:

From 79170a64bb36ee5d59781f7da87a5079d585a007 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 17 Mar 2025 05:42:43 +0000
Subject: [PATCH 36/53] chore(deps): update metcalfc/changelog-generator action
 to v4.5.0

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e7448e64..498a3b92 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -140,7 +140,7 @@ jobs:
 
       - name: Generate changelog
         id: changelog
-        uses: metcalfc/changelog-generator@v4.3.1
+        uses: metcalfc/changelog-generator@v4.5.0
         with:
           myToken: ${{ secrets.GITHUB_TOKEN }}
 

From 2301ef9f84db10e6079394b3f49d2a0e937a5055 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 13:57:45 +0000
Subject: [PATCH 37/53] chore(deps): update php docker tag to v8.4

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8ca0ba91..96e761a8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN set -x; \
     && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \
     && rm bookstack.tar.gz
 
-FROM php:8.3-apache-bookworm AS final
+FROM php:8.4-apache-bookworm AS final
 RUN set -x; \
     apt-get update \
     && apt-get install -y --no-install-recommends \

From c7ca13922027bab24f8e370f8b7d1c86d6f7415e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 13:58:10 +0000
Subject: [PATCH 38/53] chore(deps): update mysql docker tag to v8.4

---
 docker-compose.test.yml | 2 +-
 docker-compose.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 12b773a9..7d19a4a9 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -6,7 +6,7 @@ services:
     depends_on:
     - bookstack
   mysql:
-    image: mysql:8.3
+    image: mysql:8.4
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack
diff --git a/docker-compose.yml b/docker-compose.yml
index e733bd0b..e3ef44a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   mysql:
-    image: mysql:8.3
+    image: mysql:8.4
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack

From 5e5aaad148ca2c4a75877e6e8d4ca2d3a6d7ce4b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 14:03:38 +0000
Subject: [PATCH 39/53] chore(deps): update mysql docker tag to v9

---
 docker-compose.test.yml | 2 +-
 docker-compose.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 7d19a4a9..7caf048f 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -6,7 +6,7 @@ services:
     depends_on:
     - bookstack
   mysql:
-    image: mysql:8.4
+    image: mysql:9.2
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack
diff --git a/docker-compose.yml b/docker-compose.yml
index e3ef44a7..c31b6562 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   mysql:
-    image: mysql:8.4
+    image: mysql:9.2
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack

From 0ed8683dd6721497a5e1ab4c5fae4b4758136fec Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Tue, 25 Mar 2025 14:07:58 +0000
Subject: [PATCH 40/53] docs: update MySQL version in non-compose set-up docs

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 52bab784..bf8daeb2 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e MYSQL_USER=bookstack \
    -e MYSQL_PASSWORD=secret \
    --name bookstack_db \
-   mysql:5.7.21
+   mysql:9.2.0
    ```
 
 2. BookStack Container:
@@ -91,7 +91,7 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e MYSQL_USER=bookstack \
    -e MYSQL_PASSWORD=secret \
     --name="bookstack_db" \
-    mysql:5.7.21
+    mysql:9.2.0
    ```
 
 3. Run BookStack Container

From 83777b0ba3118d55e30e143be8a68493266cdef3 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Tue, 25 Mar 2025 14:14:35 +0000
Subject: [PATCH 41/53] docs: add APP_KEY to docker run command

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index bf8daeb2..a40faea5 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,7 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_USERNAME=bookstack \
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
+   -e APP_KEY=SomeRandomStringWith32Characters \
    -p 8080:8080 \
    --name="bookstack_25.2.1" \
     solidnerd/bookstack:25.2.1

From f56d2ede995883534601df5bed90a6fec2090a20 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Tue, 25 Mar 2025 14:15:14 +0000
Subject: [PATCH 42/53] docs: remove instructions for Docker < 1.9

Docker 1.9 has been out of support for some time now, and shouldn't be
used. Removal of the documentation for use of this version should
hopefully avoid confusion.
---
 README.md | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/README.md b/README.md
index a40faea5..8e283223 100644
--- a/README.md
+++ b/README.md
@@ -48,32 +48,6 @@ If you have any issues feel free to create an [issue on GitHub](https://github.c
 
 Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDAP_USER_FILTER"="(&(uid=\${user}))"`
 
-Networking changed in Docker v1.9, so you need to do one of the following steps.
-
-### Docker < v1.9
-
-1. MySQL Container:
-
-   ```bash
-   docker run -d \
-   -p 3306:3306 \
-   -e MYSQL_ROOT_PASSWORD=secret \
-   -e MYSQL_DATABASE=bookstack \
-   -e MYSQL_USER=bookstack \
-   -e MYSQL_PASSWORD=secret \
-   --name bookstack_db \
-   mysql:9.2.0
-   ```
-
-2. BookStack Container:
-
-   ```bash
-   docker run -d --link bookstack_db_:mysql \
-   -p 8080:8080 \
-   --name bookstack_25.2.1 \
-   solidnerd/bookstack:25.2.1
-   ```
-
 ### Docker 1.9+
 
 1. Create a shared network:

From 4069ae377f4fc212e28304c00bed86c97c31d684 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Tue, 25 Mar 2025 14:23:47 +0000
Subject: [PATCH 43/53] docs: remove outdated guidance on .env in non-compose
 instructions

---
 README.md | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 8e283223..a2405689 100644
--- a/README.md
+++ b/README.md
@@ -98,19 +98,15 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA
 
 ### Volumes
 
-To access your `.env` file and important bookstack folders on your host system
-change `<HOST>` in the following line to your host directory and add it then to
-your run command:
+To access your important bookstack folders on your host system change `<HOST>`
+in the following line to your host directory and add it then to your run
+command:
 
 ```bash
---mount type=bind,source=<HOST>/.env,target=/var/www/bookstack/.env \
 -v <HOST>:/var/www/bookstack/public/uploads \
 -v <HOST>:/var/www/bookstack/storage/uploads
 ```
 
-In case of a windows host machine the .env file has to be already created in the
-host directory otherwise a folder named .env will be created.
-
 After these steps you can visit [http://localhost:8080](http://localhost:8080).
 You can login with username `admin@admin.com` and password `password`.
 

From 14475c8b280cea1cab24171404f1fc7c551d68ee Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Tue, 25 Mar 2025 14:31:55 +0000
Subject: [PATCH 44/53] feat: change default APP_URL value

Running a freshly-clone repository fails as the Bookstack container
redirects to `example.com`, which isn't hosting a Bookstack instance.
Updating the `APP_URL` to be the value set by default and referred to in
the documention will prevent this.
---
 README.md          | 6 +++---
 docker-compose.yml | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index a2405689..eedfc419 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA
    -e DB_DATABASE=bookstack \
    -e DB_USERNAME=bookstack \
    -e DB_PASSWORD=secret \
-   -e APP_URL=http://example.com \
+   -e APP_URL=http://localhost:8080 \
    -e APP_KEY=SomeRandomStringWith32Characters \
    -p 8080:8080 \
    --name="bookstack_25.2.1" \
@@ -84,9 +84,9 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
-    a trailing slash. For example:
+    a trailing slash, but including any port numbers. For example:
 
-    `APP_URL=http://example.com`
+    `APP_URL=http://example.com` or `APP_URL=http://localhost:8080`.
 
     The following environment variables are required for Bookstack to start:
     - `APP_KEY`
diff --git a/docker-compose.yml b/docker-compose.yml
index c31b6562..d204c03b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,8 +19,12 @@ services:
     - DB_DATABASE=bookstack
     - DB_USERNAME=bookstack
     - DB_PASSWORD=secret
-    #set the APP_ to the URL of bookstack without without a trailing slash APP_URL=https://example.com
-    - APP_URL=http://example.com
+    # Set the APP_ to the URL of bookstack without without a trailing slash,
+    # but including any port numbers. For example, one of:
+    # APP_URL=https://example.com
+    # APP_URL=http://localhost:8080
+    # APP_URL=https://wiki.example.com:8443
+    - APP_URL=http://localhost:8080
     # APP_KEY is used for encryption where needed, so needs to be persisted to
     # preserve decryption abilities.
     # Can run `php artisan key:generate` to generate a key

From 8f79725cf4d52e02626def1a1d92c1cca328df32 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Wed, 2 Apr 2025 18:36:11 +0100
Subject: [PATCH 45/53] feat: update Dockerfile to use Bookstack v25.02.2

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 96e761a8..3d940212 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v25.02.1
+ENV BOOKSTACK_VERSION=v25.02.2
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \

From 4b1550814d7f070cb46b777951b737f2cf05cce1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 21:28:37 +0000
Subject: [PATCH 46/53] chore(deps): update solidnerd/bookstack docker tag to
 v25.2.2

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d204c03b..bfb3ad29 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:25.2.1
+    image: solidnerd/bookstack:25.2.2
     depends_on:
     - mysql
     environment:

From cadb2914d220d5b19aa44b27514d478f2af170c2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 6 Apr 2025 10:26:47 +0000
Subject: [PATCH 47/53] chore(deps): update metcalfc/changelog-generator action
 to v4.6.2

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 498a3b92..c0f69e6b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -140,7 +140,7 @@ jobs:
 
       - name: Generate changelog
         id: changelog
-        uses: metcalfc/changelog-generator@v4.5.0
+        uses: metcalfc/changelog-generator@v4.6.2
         with:
           myToken: ${{ secrets.GITHUB_TOKEN }}
 

From 7d8e34d9ec1d7c6114b015c4f8826dc2358bd5e2 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Tue, 6 May 2025 11:02:19 +0100
Subject: [PATCH 48/53] feat: update Dockerfile to use Bookstack v25.02.3

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 3d940212..eae3c47f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v25.02.2
+ENV BOOKSTACK_VERSION=v25.02.3
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \

From 5e7adebf53515b6932cd58bc86c4594114c1b74c Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Tue, 6 May 2025 11:05:07 +0100
Subject: [PATCH 49/53] doc: update documentation to reference 25.2.3

---
 README.md | 4 ++--
 VERSION   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index eedfc419..2424d11a 100644
--- a/README.md
+++ b/README.md
@@ -79,8 +79,8 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA
    -e APP_URL=http://localhost:8080 \
    -e APP_KEY=SomeRandomStringWith32Characters \
    -p 8080:8080 \
-   --name="bookstack_25.2.1" \
-    solidnerd/bookstack:25.2.1
+   --name="bookstack_25.2.3" \
+    solidnerd/bookstack:25.2.3
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 5870c667..9dc139e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-25.2.1
+25.2.3

From aa18cab26b5c4776c0df50dae887098dfaf43d63 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 May 2025 15:55:19 +0000
Subject: [PATCH 50/53] chore(deps): update solidnerd/bookstack docker tag to
 v25.2.3

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bfb3ad29..99928ba2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:25.2.2
+    image: solidnerd/bookstack:25.2.3
     depends_on:
     - mysql
     environment:

From 770ba7e33caab60603995e685d1b4c7a139b035b Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Thu, 8 May 2025 16:40:28 +0100
Subject: [PATCH 51/53] feat: update Dockerfile to use Bookstack v25.02.4

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index eae3c47f..2bad4238 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v25.02.3
+ENV BOOKSTACK_VERSION=v25.02.4
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \

From b0bf3ce66b744d0538fa521375439b5fd413b03a Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Thu, 8 May 2025 16:41:53 +0100
Subject: [PATCH 52/53] doc: update documentation to reference 25.2.4

---
 README.md          | 4 ++--
 VERSION            | 2 +-
 docker-compose.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2424d11a..55d7fd26 100644
--- a/README.md
+++ b/README.md
@@ -79,8 +79,8 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA
    -e APP_URL=http://localhost:8080 \
    -e APP_KEY=SomeRandomStringWith32Characters \
    -p 8080:8080 \
-   --name="bookstack_25.2.3" \
-    solidnerd/bookstack:25.2.3
+   --name="bookstack_25.2.4" \
+    solidnerd/bookstack:25.2.4
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without
diff --git a/VERSION b/VERSION
index 9dc139e6..6d0540a8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-25.2.3
+25.2.4
diff --git a/docker-compose.yml b/docker-compose.yml
index 99928ba2..21336660 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: solidnerd/bookstack:25.2.3
+    image: solidnerd/bookstack:25.2.4
     depends_on:
     - mysql
     environment:

From 30c18c19bbc2150dc5cbc9e1f6327276743f7e0e Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Sat, 17 May 2025 15:02:21 +0100
Subject: [PATCH 53/53] feat: update Dockerfile to use Bookstack v25.02.5

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 2bad4238..6b3f48c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 AS bookstack
-ENV BOOKSTACK_VERSION=v25.02.4
+ENV BOOKSTACK_VERSION=v25.02.5
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz  \