From dd86a9b2e880d632386cbcd83d3c9a8b2b74e1e0 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 26 Feb 2025 16:03:45 +0000 Subject: [PATCH 1/3] 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 Date: Wed, 26 Feb 2025 16:09:46 +0000 Subject: [PATCH 2/3] 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 Date: Wed, 26 Feb 2025 16:11:13 +0000 Subject: [PATCH 3/3] 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: