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 0523deb

Browse files
authored
Merge pull request #522 from solidnerd/rjh_release
feat: update Dockerfile to use Bookstack v24.12
2 parents 7095a1a + 8b4e656 commit 0523deb

File tree

5 files changed

+15
-10
lines changed

5 files changed

+15
-10
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM alpine:3 AS bookstack
2-
ENV BOOKSTACK_VERSION=v24.10.3
2+
ENV BOOKSTACK_VERSION=v24.12
33
RUN apk add --no-cache curl tar
44
RUN set -x; \
55
curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz \

‎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.10.3 \
74-
solidnerd/bookstack:24.10.3
73+
--name bookstack_24.12.0 \
74+
solidnerd/bookstack:24.12.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.10.3" \
108-
solidnerd/bookstack:24.10.3
107+
--name="bookstack_24.12.0" \
108+
solidnerd/bookstack:24.12.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.10.3
1+
24.12.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.10.3
14+
image: solidnerd/bookstack:24.12.0
1515
depends_on:
1616
- mysql
1717
environment:

‎scripts/update_tags_and_docs.sh‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,14 @@ 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/.}"
20-
# And again for patch version, just in case
21-
BOOKSTACK_VERSION="${BOOKSTACK_VERSION/.0/.}"
19+
BOOKSTACK_VERSION="${BOOKSTACK_VERSION//.0?/.}"
20+
21+
# If the version only has one decimal dot in it, it doesn't have a patch
22+
# version and one should be added to ensure semver-shape.
23+
BS_DECIMALS="${BOOKSTACK_VERSION//[^.]}"
24+
if [[ "${#BS_DECIMALS}" -eq "1" ]]; then
25+
BOOKSTACK_VERSION="${BOOKSTACK_VERSION}.0"
26+
fi
2227

2328
echo "Tag name: ${BOOKSTACK_VERSION}"
2429

0 commit comments

Comments
(0)

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