Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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+
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.12.1
25.2.0
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 8 additions & 1 deletion scripts/update_tags_and_docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand Down
Loading