Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b1556cb

Browse files
authored
Merge pull request #527 from solidnerd/rjh_update
Update to image version 25.2.0
2 parents 1c3e154 + 04c9182 commit b1556cb

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
7070
```bash
7171
docker run -d --link bookstack_db_:mysql \
7272
-p 8080:8080 \
73-
--name bookstack_24.12.1 \
74-
solidnerd/bookstack:24.12.1
73+
--name bookstack_25.2.0 \
74+
solidnerd/bookstack:25.2.0
7575
```
7676

7777
### Docker 1.9+
@@ -104,8 +104,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
104104
-e DB_PASSWORD=secret \
105105
-e APP_URL=http://example.com \
106106
-p 8080:8080 \
107-
--name="bookstack_24.12.1" \
108-
solidnerd/bookstack:24.12.1
107+
--name="bookstack_25.2.0" \
108+
solidnerd/bookstack:25.2.0
109109
```
110110

111111
The APP_URL parameter should be the base URL for your BookStack instance without

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24.12.1
1+
25.2.0

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
- mysql-data:/var/lib/mysql
1212

1313
bookstack:
14-
image: solidnerd/bookstack:24.12.1
14+
image: solidnerd/bookstack:25.2.0
1515
depends_on:
1616
- mysql
1717
environment:

‎scripts/update_tags_and_docs.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ echo "Extracted version: ${BOOKSTACK_VERSION}"
1616
# Remove the 'v' for our tags
1717
BOOKSTACK_VERSION="${BOOKSTACK_VERSION/#v/}"
1818
# Remove leading zeros to make the version fit a SemVer-shaped hole
19-
BOOKSTACK_VERSION="${BOOKSTACK_VERSION//.0?/.}"
19+
BOOKSTACK_VERSION="${BOOKSTACK_VERSION/.0/.}"
2020

2121
# If the version only has one decimal dot in it, it doesn't have a patch
2222
# version and one should be added to ensure semver-shape.
@@ -27,6 +27,13 @@ fi
2727

2828
echo "Tag name: ${BOOKSTACK_VERSION}"
2929

30+
read -p "Is the tag name correct? (y/n)" -n 1 -r
31+
echo
32+
if ! [[ "${REPLY}" =~ ^[Yy]$ ]]; then
33+
echo "Aborting.."
34+
exit 1
35+
fi
36+
3037
git tag -s -a "${BOOKSTACK_VERSION}" -m "Release version ${BOOKSTACK_VERSION}"
3138
git push --tags
3239

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /