From 0eb2ff92e5cfcff08846b29d33b6946177e92ae8 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 23 Dec 2024 12:59:49 +0000 Subject: [PATCH 1/5] 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 Date: Mon, 23 Dec 2024 13:01:28 +0000 Subject: [PATCH 2/5] 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 Date: Mon, 23 Dec 2024 13:04:58 +0000 Subject: [PATCH 3/5] 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 Date: Mon, 23 Dec 2024 13:15:05 +0000 Subject: [PATCH 4/5] 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 Date: Mon, 23 Dec 2024 13:15:15 +0000 Subject: [PATCH 5/5] 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: