From 458213d308f50b2d5b349f841f73c1b0d9191df7 Mon Sep 17 00:00:00 2001 From: reddexx Date: Mon, 27 Feb 2023 09:07:17 +0100 Subject: [PATCH 001/161] Update to 23.02 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c854fcd..17a6eee0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.01.1 +ENV BOOKSTACK_VERSION=23.02 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 28d1aeae0455944e0c6e65ae55639acbcd0ad214 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 27 Feb 2023 08:42:22 +0000 Subject: [PATCH 002/161] Update references to 23.2.0 --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 314121fd..29b97576 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.1.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.2.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes @@ -49,8 +49,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.1.1 \ -solidnerd/bookstack:23.1.1 +--name bookstack_23.2.0 \ +solidnerd/bookstack:23.2.0 ``` #### Docker 1.9+ @@ -83,8 +83,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.1.1" \ - solidnerd/bookstack:23.1.1 +--name="bookstack_23.2.0" \ + solidnerd/bookstack:23.2.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 9b241d7f..11ebcd0e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.1.1 +23.2.0 diff --git a/docker-compose.yml b/docker-compose.yml index 662333b5..be4d2046 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.1.1 + image: solidnerd/bookstack:23.2.0 depends_on: - mysql environment: From 7d45db0bf8dee5b13eabeff42f6d17398b1d616c Mon Sep 17 00:00:00 2001 From: reddexx Date: Tue, 28 Feb 2023 08:33:13 +0100 Subject: [PATCH 003/161] Update to 23.02.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 17a6eee0..a76f4fa7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.02 +ENV BOOKSTACK_VERSION=23.02.1 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 2611b77ac98edc2eef39c5309a47bc2c98654d00 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 28 Feb 2023 09:43:19 +0000 Subject: [PATCH 004/161] Update references to version 23.2.1 --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 29b97576..402f1e99 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.2.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.2.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes @@ -49,8 +49,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.2.0 \ -solidnerd/bookstack:23.2.0 +--name bookstack_23.2.1 \ +solidnerd/bookstack:23.2.1 ``` #### Docker 1.9+ @@ -83,8 +83,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.2.0" \ - solidnerd/bookstack:23.2.0 +--name="bookstack_23.2.1" \ + solidnerd/bookstack:23.2.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 11ebcd0e..3f833b5b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.2.0 +23.2.1 diff --git a/docker-compose.yml b/docker-compose.yml index be4d2046..4d66fcae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.2.0 + image: solidnerd/bookstack:23.2.1 depends_on: - mysql environment: From 448209195d8e2d5cb55779381b4db146794ca59d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Mar 2023 20:44:50 +0000 Subject: [PATCH 005/161] chore(deps): update metcalfc/changelog-generator action to v4.1.0 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f0459875..86cfaa2b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -133,7 +133,7 @@ jobs: - name: Generate changelog id: changelog - uses: metcalfc/changelog-generator@v4.0.1 + uses: metcalfc/changelog-generator@v4.1.0 with: myToken: ${{ secrets.GITHUB_TOKEN }} From 9ca61d84dc78557b13e21813c7d1bbc8131a8ae2 Mon Sep 17 00:00:00 2001 From: reddexx Date: Thu, 30 Mar 2023 15:16:22 +0200 Subject: [PATCH 006/161] Update to 23.02.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a76f4fa7..6a92ec3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.02.1 +ENV BOOKSTACK_VERSION=23.02.2 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From dbf9afa6654bb12be8222a499f77774d2ca6f93d Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 30 Mar 2023 15:31:59 +0100 Subject: [PATCH 007/161] Update references to version 23.2.2 --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 402f1e99..ad16b296 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.2.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.2.2](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes @@ -49,8 +49,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.2.1 \ -solidnerd/bookstack:23.2.1 +--name bookstack_23.2.2 \ +solidnerd/bookstack:23.2.2 ``` #### Docker 1.9+ @@ -83,8 +83,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.2.1" \ - solidnerd/bookstack:23.2.1 +--name="bookstack_23.2.2" \ + solidnerd/bookstack:23.2.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 3f833b5b..305c263f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.2.1 +23.2.2 diff --git a/docker-compose.yml b/docker-compose.yml index 4d66fcae..46642b56 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.2.1 + image: solidnerd/bookstack:23.2.2 depends_on: - mysql environment: From e313b880b373551ff5c1c0ad1afa7e7928cc5695 Mon Sep 17 00:00:00 2001 From: joshuakraitberg Date: Sun, 2 Apr 2023 21:45:39 -0400 Subject: [PATCH 008/161] Added SAML2 support SAML2 is an alternative authorization flow often used in the same places LDAP is. The documentation for how SAML2 is used can be found here: https://www.bookstackapp.com/docs/admin/saml2-auth/ --- docker-entrypoint.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 6a2455fa..0bfb2620 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -70,6 +70,26 @@ if [ ! -f ".env" ]; then LDAP_USER_FILTER=${LDAP_USER_FILTER:-false} LDAP_VERSION=${LDAP_VERSION:-false} + # SAML2 Settings; AUTH_MODE=saml2 + AUTH_AUTO_INITIATE=${AUTH_AUTO_INITIATE:-false} + SAML2_NAME=${SAML2_NAME:-null} + SAML2_EMAIL_ATTRIBUTE=${SAML2_EMAIL_ATTRIBUTE:-null} + SAML2_EXTERNAL_ID_ATTRIBUTE=${SAML2_EXTERNAL_ID_ATTRIBUTE:-null} + SAML2_USER_TO_GROUPS=${SAML2_USER_TO_GROUPS:-false} + SAML2_GROUP_ATTRIBUTE=${SAML2_GROUP_ATTRIBUTE:-null} + SAML2_DISPLAY_NAME_ATTRIBUTES=${SAML2_DISPLAY_NAME_ATTRIBUTES:-null} + SAML2_IDP_ENTITYID=${SAML2_IDP_ENTITYID:-null} + SAML2_AUTOLOAD_METADATA=${SAML2_AUTOLOAD_METADATA:-false} + SAML2_IDP_SSO=${SAML2_IDP_SSO:-null} + SAML2_IDP_SLO=${SAML2_IDP_SLO:-null} + SAML2_IDP_x509=${SAML2_IDP_x509:-null} + SAML2_IDP_AUTHNCONTEXT=${SAML2_IDP_AUTHNCONTEXT:-false} + SAML2_SP_x509=${SAML2_SP_x509:-null} + SAML2_SP_x509_KEY=${SAML2_SP_x509_KEY:-null} + SAML2_DUMP_USER_DETAILS=${SAML2_DUMP_USER_DETAILS:-false} + SAML2_ONELOGIN_OVERRIDES=${SAML2_ONELOGIN_OVERRIDES:-null} + SAML2_REMOVE_FROM_GROUPS=${SAML2_REMOVE_FROM_GROUPS:-false} + # Mail settings MAIL_DRIVER=${MAIL_DRIVER:-smtp} MAIL_HOST=${MAIL_HOST:-localhost} From 7da5da3ecd816667230e04d8c669f26aae6956ac Mon Sep 17 00:00:00 2001 From: reddexx Date: Fri, 14 Apr 2023 08:34:29 +0200 Subject: [PATCH 009/161] Update to 23.02.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6a92ec3a..fafc690e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.02.2 +ENV BOOKSTACK_VERSION=23.02.3 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 26602edbdb8383cbff4e32de8de566ab4d96f0b6 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sun, 16 Apr 2023 20:54:17 +0100 Subject: [PATCH 010/161] Update references to 23.2.3 --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ad16b296..b952f24c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.2.2](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.2.3](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes @@ -49,8 +49,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.2.2 \ -solidnerd/bookstack:23.2.2 +--name bookstack_23.2.3 \ +solidnerd/bookstack:23.2.3 ``` #### Docker 1.9+ @@ -83,8 +83,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.2.2" \ - solidnerd/bookstack:23.2.2 +--name="bookstack_23.2.3" \ + solidnerd/bookstack:23.2.3 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 305c263f..2d436a3c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.2.2 +23.2.3 diff --git a/docker-compose.yml b/docker-compose.yml index 46642b56..53cced24 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.2.2 + image: solidnerd/bookstack:23.2.3 depends_on: - mysql environment: From 6445d86d581d5cc191f9d237cc2feb36b8757710 Mon Sep 17 00:00:00 2001 From: reddexx Date: Thu, 4 May 2023 08:33:42 +0200 Subject: [PATCH 011/161] Update to 23.05 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fafc690e..f5c9ba6f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.02.3 +ENV BOOKSTACK_VERSION=23.05 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 74c3f232e2015ffd552515369306b6860bda1158 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 4 May 2023 18:57:45 +0100 Subject: [PATCH 012/161] Update referecnes to 23.5.0 --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b952f24c..e60d5053 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.2.3](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.5.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes @@ -49,8 +49,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.2.3 \ -solidnerd/bookstack:23.2.3 +--name bookstack_23.5.0 \ +solidnerd/bookstack:23.5.0 ``` #### Docker 1.9+ @@ -83,8 +83,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.2.3" \ - solidnerd/bookstack:23.2.3 +--name="bookstack_23.5.0" \ + solidnerd/bookstack:23.5.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 2d436a3c..71227902 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.2.3 +23.5.0 diff --git a/docker-compose.yml b/docker-compose.yml index 53cced24..915dbd86 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.2.3 + image: solidnerd/bookstack:23.5.0 depends_on: - mysql environment: From c17a1e176dd115576db0bd16db28e8bda0ef54f0 Mon Sep 17 00:00:00 2001 From: reddexx Date: Tue, 9 May 2023 11:24:42 +0200 Subject: [PATCH 013/161] Update Bookstack 23.05.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f5c9ba6f..b4a845b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.05 +ENV BOOKSTACK_VERSION=23.05.1 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From c744c446dade1c00353c0e0a6e703cbfde1491eb Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 10 May 2023 11:49:24 +0100 Subject: [PATCH 014/161] Update references to version 23.5.1 --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e60d5053..6a88e32d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.5.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.5.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes @@ -49,8 +49,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.5.0 \ -solidnerd/bookstack:23.5.0 +--name bookstack_23.5.1 \ +solidnerd/bookstack:23.5.1 ``` #### Docker 1.9+ @@ -83,8 +83,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.5.0" \ - solidnerd/bookstack:23.5.0 +--name="bookstack_23.5.1" \ + solidnerd/bookstack:23.5.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 71227902..432afd4d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.5.0 +23.5.1 diff --git a/docker-compose.yml b/docker-compose.yml index 915dbd86..8c2f6629 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.5.0 + image: solidnerd/bookstack:23.5.1 depends_on: - mysql environment: From c39c1ac831bd769743a2da6fca524aba25a48957 Mon Sep 17 00:00:00 2001 From: reddexx Date: Thu, 25 May 2023 10:07:18 +0200 Subject: [PATCH 015/161] Update Bookstack 23.05.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b4a845b8..1a87ab87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.05.1 +ENV BOOKSTACK_VERSION=23.05.2 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 2abde2f34a5018c35f70baa54b66e34e4e6466b7 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 25 May 2023 09:51:12 +0100 Subject: [PATCH 016/161] Update references to 23.5.2 --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6a88e32d..dcba54b5 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.5.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.5.2](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes @@ -49,8 +49,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.5.1 \ -solidnerd/bookstack:23.5.1 +--name bookstack_23.5.2 \ +solidnerd/bookstack:23.5.2 ``` #### Docker 1.9+ @@ -83,8 +83,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.5.1" \ - solidnerd/bookstack:23.5.1 +--name="bookstack_23.5.2" \ + solidnerd/bookstack:23.5.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 432afd4d..b8ea52af 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.5.1 +23.5.2 diff --git a/docker-compose.yml b/docker-compose.yml index 8c2f6629..60ee40b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.5.1 + image: solidnerd/bookstack:23.5.2 depends_on: - mysql environment: From 1255e5bc9e84ae671cc56f88acc72d8048d6aff3 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 19 Jun 2023 13:53:06 +0100 Subject: [PATCH 017/161] Update base image from Buster to Bookworm wkhtmltopdf doesn't list a Bookworm download, but is listed under https://github.com/wkhtmltopdf/packaging/releases --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a87ab87..38b62e87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN set -x; \ && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \ && rm bookstack.tar.gz -FROM php:8.2-apache-buster as final +FROM php:8.2-apache-bookworm as final RUN set -x; \ apt-get update \ && apt-get install -y --no-install-recommends \ @@ -27,10 +27,10 @@ RUN set -x; \ curl \ libzip-dev \ unzip \ - && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb \ - && chmod a+x ./wkhtmltox_0.12.6-1.buster_amd64.deb \ - && apt-get install -y ./wkhtmltox_0.12.6-1.buster_amd64.deb \ - && rm ./wkhtmltox_0.12.6-1.buster_amd64.deb \ + && wget -O wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb \ + && chmod a+x ./wkhtmltox.deb \ + && apt-get install -y ./wkhtmltox.deb \ + && rm ./wkhtmltox.deb \ && docker-php-ext-install -j$(nproc) dom pdo pdo_mysql zip tidy \ && docker-php-ext-configure ldap \ && docker-php-ext-install -j$(nproc) ldap \ From 502a9b5a848eac768b17042aca5cff6cc39b4bc6 Mon Sep 17 00:00:00 2001 From: Antoine MICHARD Date: Tue, 27 Jun 2023 09:19:58 +0200 Subject: [PATCH 018/161] Add LDAP options --- docker-entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 0bfb2620..a7274687 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -69,6 +69,9 @@ if [ ! -f ".env" ]; then LDAP_PASS=${LDAP_PASS:-false} LDAP_USER_FILTER=${LDAP_USER_FILTER:-false} LDAP_VERSION=${LDAP_VERSION:-false} + LDAP_ID_ATTRIBUTE=${LDAP_ID_ATTRIBUTE:-false} + LDAP_TLS_INSECURE=${LDAP_TLS_INSECURE:-false} + LDAP_DISPLAY_NAME_ATTRIBUTE=${LDAP_DISPLAY_NAME_ATTRIBUTE:-false} # SAML2 Settings; AUTH_MODE=saml2 AUTH_AUTO_INITIATE=${AUTH_AUTO_INITIATE:-false} From 8422f441dadf5815ea3deec17059c575a9536a25 Mon Sep 17 00:00:00 2001 From: reddexx Date: Mon, 3 Jul 2023 08:26:25 +0200 Subject: [PATCH 019/161] Update Dockerfile Update to 23.06 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 38b62e87..e71f234d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.05.2 +ENV BOOKSTACK_VERSION=23.06 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 52bcd1210574b414e571c35464ff7f13e351e80d Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 3 Jul 2023 07:56:22 +0100 Subject: [PATCH 020/161] Update references to version 23.6.0 --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index dcba54b5..f36a077b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.5.2](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.6.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes @@ -49,8 +49,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.5.2 \ -solidnerd/bookstack:23.5.2 +--name bookstack_23.6.0 \ +solidnerd/bookstack:23.6.0 ``` #### Docker 1.9+ @@ -83,8 +83,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.5.2" \ - solidnerd/bookstack:23.5.2 +--name="bookstack_23.6.0" \ + solidnerd/bookstack:23.6.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index b8ea52af..0373daaf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.5.2 +23.6.0 diff --git a/docker-compose.yml b/docker-compose.yml index 60ee40b3..48bd4fef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.5.2 + image: solidnerd/bookstack:23.6.0 depends_on: - mysql environment: From 24ba4f318a50b76b9a4ef10a69c45abed55f40de Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 3 Jul 2023 09:42:12 +0100 Subject: [PATCH 021/161] Revert "Added SAML2 support" This reverts commit e313b880b373551ff5c1c0ad1afa7e7928cc5695. --- docker-entrypoint.sh | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index a7274687..36988d89 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -73,26 +73,6 @@ if [ ! -f ".env" ]; then LDAP_TLS_INSECURE=${LDAP_TLS_INSECURE:-false} LDAP_DISPLAY_NAME_ATTRIBUTE=${LDAP_DISPLAY_NAME_ATTRIBUTE:-false} - # SAML2 Settings; AUTH_MODE=saml2 - AUTH_AUTO_INITIATE=${AUTH_AUTO_INITIATE:-false} - SAML2_NAME=${SAML2_NAME:-null} - SAML2_EMAIL_ATTRIBUTE=${SAML2_EMAIL_ATTRIBUTE:-null} - SAML2_EXTERNAL_ID_ATTRIBUTE=${SAML2_EXTERNAL_ID_ATTRIBUTE:-null} - SAML2_USER_TO_GROUPS=${SAML2_USER_TO_GROUPS:-false} - SAML2_GROUP_ATTRIBUTE=${SAML2_GROUP_ATTRIBUTE:-null} - SAML2_DISPLAY_NAME_ATTRIBUTES=${SAML2_DISPLAY_NAME_ATTRIBUTES:-null} - SAML2_IDP_ENTITYID=${SAML2_IDP_ENTITYID:-null} - SAML2_AUTOLOAD_METADATA=${SAML2_AUTOLOAD_METADATA:-false} - SAML2_IDP_SSO=${SAML2_IDP_SSO:-null} - SAML2_IDP_SLO=${SAML2_IDP_SLO:-null} - SAML2_IDP_x509=${SAML2_IDP_x509:-null} - SAML2_IDP_AUTHNCONTEXT=${SAML2_IDP_AUTHNCONTEXT:-false} - SAML2_SP_x509=${SAML2_SP_x509:-null} - SAML2_SP_x509_KEY=${SAML2_SP_x509_KEY:-null} - SAML2_DUMP_USER_DETAILS=${SAML2_DUMP_USER_DETAILS:-false} - SAML2_ONELOGIN_OVERRIDES=${SAML2_ONELOGIN_OVERRIDES:-null} - SAML2_REMOVE_FROM_GROUPS=${SAML2_REMOVE_FROM_GROUPS:-false} - # Mail settings MAIL_DRIVER=${MAIL_DRIVER:-smtp} MAIL_HOST=${MAIL_HOST:-localhost} From 6a8334e63a3aba8a8cba1873381cd8c6ac0ab6a0 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 3 Jul 2023 10:02:37 +0100 Subject: [PATCH 022/161] Update references to new release tag Tag 23.6.0 is broken and doesn't work unless SAML settings are present in the container's environment. --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index f36a077b..db9e0bdf 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.6.0](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.6.0-1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes @@ -49,8 +49,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.6.0 \ -solidnerd/bookstack:23.6.0 +--name bookstack_23.6.0-1 \ +solidnerd/bookstack:23.6.0-1 ``` #### Docker 1.9+ @@ -83,8 +83,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.6.0" \ - solidnerd/bookstack:23.6.0 +--name="bookstack_23.6.0-1" \ + solidnerd/bookstack:23.6.0-1 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 0373daaf..5a237a2f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.6.0 +23.6.0-1 diff --git a/docker-compose.yml b/docker-compose.yml index 48bd4fef..2d23cc7f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.6.0 + image: solidnerd/bookstack:23.6.0-1 depends_on: - mysql environment: From 8aef7295dc992f80128e14be1c006416acf51d28 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 3 Jul 2023 10:18:56 +0100 Subject: [PATCH 023/161] Add notes to README about v23.6.0 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index db9e0bdf..a4743271 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,11 @@ ### Changes +The version 23.6.0 is broken due to a bad `.env` configuration created by the +entrypoint script. This is fixed in version 23.6.0-1. + In 0.28.0 we changed the container http port from 80 to 8080 to allow root privileges to be dropped + In 0.12.2 we removed `DB_PORT` . You can now specify the port via `DB_HOST` like `DB_HOST=mysql:3306` ### Quickstart From 294534dfbc01098d1ce68b874c4926e654ad9497 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 4 Jul 2023 21:08:12 +0100 Subject: [PATCH 024/161] Enable workflow 'latest' pushes for all tagged releases --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86cfaa2b..9b55da5d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,6 +74,8 @@ jobs: images: | solidnerd/bookstack ghcr.io/solidnerd/docker-bookstack + flavour: | + latest=true tags: | type=semver,pattern={{version}} type=semver,pattern={{major}}.{{minor}} From b2129098713c0b33a8f923c1ad82e76d7f61b7b5 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 4 Jul 2023 21:20:55 +0100 Subject: [PATCH 025/161] Add additional notes on why latest is always enabled See issue #410 for more --- .github/workflows/release.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9b55da5d..47b51dc7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -74,6 +74,11 @@ jobs: images: | solidnerd/bookstack ghcr.io/solidnerd/docker-bookstack + # Blanket-enable "latest" tagging for all of the releases that make it + # this far, as SemVer's pre-release tag is used as a build indicator + # for this project. Note that _actual_ semver build info is not used, + # as it is discarded by almost everything that consumes SemVer (as it + # should be). flavour: | latest=true tags: | From 9d214cbde6ed13970e3ffb9267f14f9b2a712ddf Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 4 Jul 2023 21:21:21 +0100 Subject: [PATCH 026/161] 'correct' spelling of flavor for Docker metadata action --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 47b51dc7..49e60464 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,7 +79,7 @@ jobs: # for this project. Note that _actual_ semver build info is not used, # as it is discarded by almost everything that consumes SemVer (as it # should be). - flavour: | + flavor: | latest=true tags: | type=semver,pattern={{version}} From 0cbfa2c6911b4b45d851e191aa1658b63f59b55b Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 4 Jul 2023 21:35:08 +0100 Subject: [PATCH 027/161] Update references to 23.6.0-3 --- README.md | 12 ++++++------ VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a4743271..a594d677 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.6.0-1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.6.0-3](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes The version 23.6.0 is broken due to a bad `.env` configuration created by the -entrypoint script. This is fixed in version 23.6.0-1. +entrypoint script. This is fixed in version 23.6.0-3. In 0.28.0 we changed the container http port from 80 to 8080 to allow root privileges to be dropped @@ -53,8 +53,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.6.0-1 \ -solidnerd/bookstack:23.6.0-1 +--name bookstack_23.6.0-3 \ +solidnerd/bookstack:23.6.0-3 ``` #### Docker 1.9+ @@ -87,8 +87,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.6.0-1" \ - solidnerd/bookstack:23.6.0-1 +--name="bookstack_23.6.0-3" \ + solidnerd/bookstack:23.6.0-3 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 5a237a2f..7fc33476 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.6.0-1 +23.6.0-3 diff --git a/docker-compose.yml b/docker-compose.yml index 2d23cc7f..16159f73 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.6.0-1 + image: solidnerd/bookstack:23.6.0-3 depends_on: - mysql environment: From 8aeb05296540fffbd8a8c1fc3e60c251b83725e5 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 5 Jul 2023 14:02:38 +0100 Subject: [PATCH 028/161] Update Dockerfile for Bookstack 23.6.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e71f234d..5f2df71b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.06 +ENV BOOKSTACK_VERSION=23.06.1 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 859eccb5c6eaf4c39cbb796b492ce5a31205b2ee Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 5 Jul 2023 14:05:21 +0100 Subject: [PATCH 029/161] Update references to version 23.6.1 --- README.md | 12 ++++++------ VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index a594d677..4ca5ac13 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") -## Current Version: [23.6.0-3](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +## Current Version: [23.6.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) ### Changes The version 23.6.0 is broken due to a bad `.env` configuration created by the -entrypoint script. This is fixed in version 23.6.0-3. +entrypoint script. This is fixed in version 23.6.1. In 0.28.0 we changed the container http port from 80 to 8080 to allow root privileges to be dropped @@ -53,8 +53,8 @@ mysql:5.7.21 ```bash docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ ---name bookstack_23.6.0-3 \ -solidnerd/bookstack:23.6.0-3 +--name bookstack_23.6.1 \ +solidnerd/bookstack:23.6.1 ``` #### Docker 1.9+ @@ -87,8 +87,8 @@ docker run -d --net bookstack_nw \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ -p 8080:8080 \ ---name="bookstack_23.6.0-3" \ - solidnerd/bookstack:23.6.0-3 +--name="bookstack_23.6.1" \ + solidnerd/bookstack:23.6.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: diff --git a/VERSION b/VERSION index 7fc33476..5af34458 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.6.0-3 +23.6.1 diff --git a/docker-compose.yml b/docker-compose.yml index 16159f73..fc65dda0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.6.0-3 + image: solidnerd/bookstack:23.6.1 depends_on: - mysql environment: From 92efa552009a73406858f438f8f1274619ba68ac Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 5 Jul 2023 15:06:38 +0100 Subject: [PATCH 030/161] Remove trailing spaces from Makefile lines --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 04f6ff2a..c5a00a55 100644 --- a/Makefile +++ b/Makefile @@ -13,13 +13,13 @@ build: -t $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) \ --build-arg VCS_REF=$(DOCKER_INTERNAL_TAG) \ --build-arg BUILD_DATE=$(BUILD_DATE) \ - --build-arg VCS_URL=$(VCS_URL) + --build-arg VCS_URL=$(VCS_URL) push-dev: docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) pull: - docker pull $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) + docker pull $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) release: docker tag $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE_DEV):$(DOCKER_INTERNAL_TAG) $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):$(DOCKER_RELEASE_TAG) @@ -30,7 +30,7 @@ push-release: docker push $(DOCKER_RELEASE_REG)/$(DOCKER_IMAGE):latest -e2e: +e2e: @BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml up -d @BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml run --rm sut @BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml down -v From 8149e1ff00596be591725b5add5b2e00ed3a1d54 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 5 Jul 2023 18:35:28 +0100 Subject: [PATCH 031/161] (Mostly) lint README with Markdownlint --- README.md | 132 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 73 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 4ca5ac13..fdf2dafd 100644 --- a/README.md +++ b/README.md @@ -1,111 +1,125 @@ -## Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack) +# Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack) [![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") ## Current Version: [23.6.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) -### Changes +## Changes The version 23.6.0 is broken due to a bad `.env` configuration created by the entrypoint script. This is fixed in version 23.6.1. -In 0.28.0 we changed the container http port from 80 to 8080 to allow root privileges to be dropped +In 0.28.0 we changed the container http port from 80 to 8080 to allow root +privileges to be dropped -In 0.12.2 we removed `DB_PORT` . You can now specify the port via `DB_HOST` like `DB_HOST=mysql:3306` +In 0.12.2 we removed `DB_PORT` . You can now specify the port via `DB_HOST` like +`DB_HOST=mysql:3306` -### Quickstart +## Quickstart With Docker Compose is a Quickstart very easy. Run the following command: -``` +```bash docker-compose up ``` -and after that open your Browser and go to [http://localhost:8080](http://localhost:8080) . You can login with username 'admin@admin.com' and password 'password'. +and after that open your Browser and go to +[http://localhost:8080](http://localhost:8080) . You can login with username +`admin@admin.com` and password `password`. -### Issues +## Issues If you have any issues feel free to create an [issue on GitHub](https://github.com/solidnerd/docker-bookstack/issues). - -### How to use the Image without Docker compose +## How to use the Image without Docker compose Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDAP_USER_FILTER"="(&(uid=\${user}))"` Networking changed in Docker v1.9, so you need to do one of the following steps. -#### Docker < v1.9 +### Docker < v1.9 1. MySQL Container: -```bash -docker run -d \ --p 3306:3306 \ --e MYSQL_ROOT_PASSWORD=secret \ --e MYSQL_DATABASE=bookstack \ --e MYSQL_USER=bookstack \ --e MYSQL_PASSWORD=secret \ ---name bookstack_db \ -mysql:5.7.21 -``` + ```bash + docker run -d \ + -p 3306:3306 \ + -e MYSQL_ROOT_PASSWORD=secret \ + -e MYSQL_DATABASE=bookstack \ + -e MYSQL_USER=bookstack \ + -e MYSQL_PASSWORD=secret \ + --name bookstack_db \ + mysql:5.7.21 + ``` + 2. BookStack Container: -```bash -docker run -d --link bookstack_db_:mysql \ --p 8080:8080 \ ---name bookstack_23.6.1 \ -solidnerd/bookstack:23.6.1 -``` + ```bash + docker run -d --link bookstack_db_:mysql \ + -p 8080:8080 \ + --name bookstack_23.6.1 \ + solidnerd/bookstack:23.6.1 + ``` -#### Docker 1.9+ +### Docker 1.9+ 1. Create a shared network: -```bash -docker network create bookstack_nw -``` + ```bash + docker network create bookstack_nw + ``` 2. Run MySQL container : -```bash -docker run -d --net bookstack_nw \ --e MYSQL_ROOT_PASSWORD=secret \ --e MYSQL_DATABASE=bookstack \ --e MYSQL_USER=bookstack \ --e MYSQL_PASSWORD=secret \ - --name="bookstack_db" \ - mysql:5.7.21 -``` + ```bash + docker run -d --net bookstack_nw \ + -e MYSQL_ROOT_PASSWORD=secret \ + -e MYSQL_DATABASE=bookstack \ + -e MYSQL_USER=bookstack \ + -e MYSQL_PASSWORD=secret \ + --name="bookstack_db" \ + mysql:5.7.21 + ``` 3. Run BookStack Container -```bash -docker run -d --net bookstack_nw \ --e DB_HOST=bookstack_db:3306 \ --e DB_DATABASE=bookstack \ --e DB_USERNAME=bookstack \ --e DB_PASSWORD=secret \ --e APP_URL=http://example.com \ --p 8080:8080 \ ---name="bookstack_23.6.1" \ - solidnerd/bookstack:23.6.1 -``` + ```bash + docker run -d --net bookstack_nw \ + -e DB_HOST=bookstack_db:3306 \ + -e DB_DATABASE=bookstack \ + -e DB_USERNAME=bookstack \ + -e DB_PASSWORD=secret \ + -e APP_URL=http://example.com \ + -p 8080:8080 \ + --name="bookstack_23.6.1" \ + solidnerd/bookstack:23.6.1 + ``` + + The APP_URL parameter should be the base URL for your BookStack instance without + a trailing slash. For example: -The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example: -APP_URL=http://example.com + `APP_URL=http://example.com` -#### Volumes -To access your `.env` file and important bookstack folders on your host system change `` in the following line to your host directory and add it then to your run command: +### Volumes + +To access your `.env` file and important bookstack folders on your host system +change `` in the following line to your host directory and add it then to +your run command: ```bash --mount type=bind,source=/.env,target=/var/www/bookstack/.env \ -v :/var/www/bookstack/public/uploads \ -v :/var/www/bookstack/storage/uploads ``` -In case of a windows host machine the .env file has to be already created in the host directory otherwise a folder named .env will be created. -After these steps you can visit [http://localhost:8080](http://localhost:8080) . You can login with username 'admin@admin.com' and password 'password'. +In case of a windows host machine the .env file has to be already created in the +host directory otherwise a folder named .env will be created. + +After these steps you can visit [http://localhost:8080](http://localhost:8080) . +You can login with username `admin@admin.com` and password `password`. -### Inspiration +## Inspiration -This is a fork of [Kilhog/docker-bookstack](https://github.com/Kilhog/docker-bookstack). Kilhog did the intial work, but I want to go in a different direction. +This is a fork of +[Kilhog/docker-bookstack](https://github.com/Kilhog/docker-bookstack). Kilhog +did the intial work, but I want to go in a different direction. From 5e3a221758d7e193d3c1a4aea38cf9c81ca706bb Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 5 Jul 2023 18:48:44 +0100 Subject: [PATCH 032/161] Replace Travis CI badge with Shields.io --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fdf2dafd..6ce4138c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Docker Image For [BookStack](https://github.com/ssddanbrown/BookStack) -[![Build Status](https://travis-ci.org/solidnerd/docker-bookstack.svg?branch=master)](https://travis-ci.org/solidnerd/docker-bookstack) [![](https://images.microbadger.com/badges/image/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own image badge on microbadger.com") [![](https://images.microbadger.com/badges/commit/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own commit badge on microbadger.com") [![](https://images.microbadger.com/badges/version/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own version badge on microbadger.com") [![](https://images.microbadger.com/badges/license/solidnerd/bookstack.svg)](https://microbadger.com/images/solidnerd/bookstack "Get your own license badge on microbadger.com") - -## Current Version: [23.6.1](https://github.com/SolidNerd/docker-bookstack/blob/master/Dockerfile) +![Build Status](https://img.shields.io/github/actions/workflow/status/solidnerd/docker-bookstack/master.yml) +![Latest release](https://img.shields.io/github/v/tag/solidnerd/docker-bookstack?label=Latest%20release) +![GitHub contributors](https://img.shields.io/github/contributors/solidnerd/docker-bookstack) ## Changes From fe768c4238e28233556cbbb74ee0f4b41c446d43 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 5 Jul 2023 18:57:46 +0100 Subject: [PATCH 033/161] Remove accidental change to fixed-in version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6ce4138c..b0016e9a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ## Changes The version 23.6.0 is broken due to a bad `.env` configuration created by the -entrypoint script. This is fixed in version 23.6.1. +entrypoint script. This is fixed in version 23.6.0-1. In 0.28.0 we changed the container http port from 80 to 8080 to allow root privileges to be dropped From c57b4404ab0e50ca5629cd22475d28c58982a85f Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 13 Jul 2023 10:18:21 +0100 Subject: [PATCH 034/161] Update to Bookstack version 23.06.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5f2df71b..9c595776 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.06.1 +ENV BOOKSTACK_VERSION=23.06.2 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From e5b242fdfb74b11dc800b48a1e2461965bfa05a2 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 13 Jul 2023 10:20:13 +0100 Subject: [PATCH 035/161] Update references to 23.6.2 --- 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 b0016e9a..915af9e7 100644 --- a/README.md +++ b/README.md @@ -57,8 +57,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_23.6.1 \ - solidnerd/bookstack:23.6.1 + --name bookstack_23.6.2 \ + solidnerd/bookstack:23.6.2 ``` ### Docker 1.9+ @@ -91,8 +91,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_23.6.1" \ - solidnerd/bookstack:23.6.1 + --name="bookstack_23.6.2" \ + solidnerd/bookstack:23.6.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 5af34458..425ffbb8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.6.1 +23.6.2 diff --git a/docker-compose.yml b/docker-compose.yml index fc65dda0..f7eafa79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.6.1 + image: solidnerd/bookstack:23.6.2 depends_on: - mysql environment: From 152145af96cc01c4acf03a60a95f8ef4fad5cc63 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 3 Jul 2023 10:44:57 +0100 Subject: [PATCH 036/161] Remove .env file generation from entrypoint --- docker-entrypoint.sh | 82 ++------------------------------------------ 1 file changed, 2 insertions(+), 80 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 36988d89..529889a6 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -7,86 +7,8 @@ echoerr() { echo "$@" 1>&2; } IFS=":" read -r DB_HOST_NAME DB_PORT <<< "$DB_HOST" DB_PORT=${DB_PORT:-3306} -if [ ! -f ".env" ]; then - if [[ "${DB_HOST}" ]]; then - cat > ".env" <&2 'error: missing DB_HOST environment variable' - exit 1 - fi -fi +# Ensure these is no local .env file +[ -f ".env" ] && rm .env echoerr "wait-for-db: waiting for ${DB_HOST_NAME}:${DB_PORT}" From 7d861ffc8d14a655fb0b14f0075ed3dfa731738d Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 3 Jul 2023 10:53:03 +0100 Subject: [PATCH 037/161] Create function to check if vars exist --- docker-entrypoint.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 529889a6..ccc1bdb3 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,6 +3,17 @@ set -e echoerr() { echo "$@" 1>&2; } +check_vars_exist() { + var_names=("$@") + + for var_name in "${var_names[@]}"; do + if [ -z "${!var_name}" ]; then + echoerr "error: missing ${var_name} environment variable" + exit 1 + fi + done +} + # Split out host and port from DB_HOST env variable IFS=":" read -r DB_HOST_NAME DB_PORT <<< "$DB_HOST" DB_PORT=${DB_PORT:-3306} From 03907ddc2b52239e1e39847e04f9571f37242b58 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 3 Jul 2023 11:06:13 +0100 Subject: [PATCH 038/161] Ensure a number of variables exist --- docker-entrypoint.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ccc1bdb3..4494e4a8 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -21,6 +21,16 @@ DB_PORT=${DB_PORT:-3306} # Ensure these is no local .env file [ -f ".env" ] && rm .env +# Check a number of essential variables are set +check_vars_exist \ + APP_KEY \ + APP_URL \ + DB_DATABASE \ + DB_HOST \ + DB_PASSWORD \ + DB_PORT \ + DB_USERNAME + echoerr "wait-for-db: waiting for ${DB_HOST_NAME}:${DB_PORT}" timeout 15 bash < Date: Mon, 3 Jul 2023 11:17:59 +0100 Subject: [PATCH 039/161] Add env vars to docker-compose --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index f7eafa79..6fe713f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,6 +21,10 @@ services: - DB_PASSWORD=secret #set the APP_ to the URL of bookstack without without a trailing slash APP_URL=https://example.com - APP_URL=http://example.com + # APP_KEY is used for encryption where needed, so needs to be persisted to + # preserve decryption abilities. + # Can run `php artisan key:generate` to generate a key + - APP_KEY=SomeRandomString volumes: - uploads:/var/www/bookstack/public/uploads - storage-uploads:/var/www/bookstack/storage/uploads From 0728a23067a76c0b22ae66692d542e2296efa63d Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 5 Jul 2023 15:03:32 +0100 Subject: [PATCH 040/161] Patch test compose file to specify required vars --- docker-compose.test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 71e50543..55dc8315 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -21,6 +21,7 @@ services: - mysql environment: - APP_URL=http://localhost:${DEV_PORT:-8080} + - APP_KEY=SomeRandomString - DB_HOST=mysql:3306 - DB_DATABASE=bookstack - DB_USERNAME=bookstack From c5219c8ec331586dbde6d87b71e07700846d51d2 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 5 Jul 2023 18:18:41 +0100 Subject: [PATCH 041/161] Make note of required arguments --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 915af9e7..ade07241 100644 --- a/README.md +++ b/README.md @@ -100,6 +100,14 @@ Networking changed in Docker v1.9, so you need to do one of the following steps. `APP_URL=http://example.com` + The following environment variables are required for Bookstack to start: + - `APP_KEY` + - `APP_URL` + - `DB_HOST` (in the form `${hostname_or_ip_address}:${port}`) + - `DB_DATABASE` + - `DB_USERNAME` + - `DB_PASSWORD` + ### Volumes To access your `.env` file and important bookstack folders on your host system @@ -115,7 +123,7 @@ your run command: In case of a windows host machine the .env file has to be already created in the host directory otherwise a folder named .env will be created. -After these steps you can visit [http://localhost:8080](http://localhost:8080) . +After these steps you can visit [http://localhost:8080](http://localhost:8080). You can login with username `admin@admin.com` and password `password`. ## Inspiration From ab52487162e6730deca40214545c9f5b2ac0a31e Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 5 Jul 2023 18:24:57 +0100 Subject: [PATCH 042/161] Add notes on breaking change --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index ade07241..5eb55016 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,16 @@ ## Changes +Versions higher than 23.6.2 no longer use an in-container `.env` file for +environment variable management. Instead, the preferred approach is to manage +them directly with the container runtime (e.g. Docker's `-e`). This is to +simplify troubleshooting if and when errors occur. The most important change is +that `${APP_KEY}` is no longer provided for you, instead it is up to the +operator to ensure this value is present. Versions prior to this supplied +`${APP_KEY}` (with a default of `SomeRandomStringWith32Characters`. A full +reference of available environment variables is available in the [Bookstack +repository](https://github.com/BookStackApp/BookStack/blob/development/.env.example.complete) + The version 23.6.0 is broken due to a bad `.env` configuration created by the entrypoint script. This is fixed in version 23.6.0-1. From f5338810adff8a1c125093853c386cc5a98155b0 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 7 Jul 2023 12:03:23 +0100 Subject: [PATCH 043/161] Adjust entrypoint script to move env file instead of removing --- docker-entrypoint.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 4494e4a8..85dffed2 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -19,7 +19,11 @@ IFS=":" read -r DB_HOST_NAME DB_PORT <<< "$DB_HOST" DB_PORT=${DB_PORT:-3306} # Ensure these is no local .env file -[ -f ".env" ] && rm .env +if [ -f ".env" ]; then + mv .env .env.bak + echoerr ".env file detected - moved to .env.bak" + echoerr "Please update your configuration to use environment variables in the container!" +fi # Check a number of essential variables are set check_vars_exist \ From 2bfe6aadfe59ec45c3eddcd144762a7f6d94db78 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 7 Jul 2023 12:04:43 +0100 Subject: [PATCH 044/161] Remove key generation from entrypoint script --- docker-entrypoint.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 85dffed2..b1e93d81 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -52,9 +52,6 @@ else echoerr "wait-for-db: timeout out after 15 seconds waiting for ${DB_HOST_NAME}:${DB_PORT}" fi -echo "Generating Key..." -php artisan key:generate --show - echo "Starting Migration..." php artisan migrate --force From 7bc73ba9360db25cd87534a25c08095a78edd760 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 20 Jul 2023 17:27:07 +0100 Subject: [PATCH 045/161] Fix bad APP_KEY in Docker Compose files --- docker-compose.test.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 55dc8315..61d59392 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -21,7 +21,7 @@ services: - mysql environment: - APP_URL=http://localhost:${DEV_PORT:-8080} - - APP_KEY=SomeRandomString + - APP_KEY=SomeRandomStringWith32Characters - DB_HOST=mysql:3306 - DB_DATABASE=bookstack - DB_USERNAME=bookstack diff --git a/docker-compose.yml b/docker-compose.yml index 6fe713f9..11c35e16 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,7 @@ services: # APP_KEY is used for encryption where needed, so needs to be persisted to # preserve decryption abilities. # Can run `php artisan key:generate` to generate a key - - APP_KEY=SomeRandomString + - APP_KEY=SomeRandomStringWith32Characters volumes: - uploads:/var/www/bookstack/public/uploads - storage-uploads:/var/www/bookstack/storage/uploads From 7b6ea282a48d1baa87c778990d0d78a44f9ff614 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 20 Jul 2023 17:28:52 +0100 Subject: [PATCH 046/161] Fix typo in Dockerfile --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b1e93d81..f0fa6243 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -18,7 +18,7 @@ check_vars_exist() { IFS=":" read -r DB_HOST_NAME DB_PORT <<< "$DB_HOST" DB_PORT=${DB_PORT:-3306} -# Ensure these is no local .env file +# Ensure there is no local .env file if [ -f ".env" ]; then mv .env .env.bak echoerr ".env file detected - moved to .env.bak" From 5ff79c336604475030d112b37c53646d4bcb29fe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Aug 2023 01:06:53 +0000 Subject: [PATCH 047/161] Update mysql Docker tag to v8.1 --- docker-compose.test.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 61d59392..155d5dfa 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -6,7 +6,7 @@ services: depends_on: - bookstack mysql: - image: mysql:8.0 + image: mysql:8.1 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack diff --git a/docker-compose.yml b/docker-compose.yml index 11c35e16..72c9dc55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mysql: - image: mysql:8.0 + image: mysql:8.1 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack From 370e99d922a8b371bc54438ff515f3d4aefe4f5d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 13:28:03 +0000 Subject: [PATCH 048/161] Update dependency ubuntu to v22 --- .github/workflows/master.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index cd67048d..1f70a118 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -62,7 +62,7 @@ jobs: docker image ls -a push: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: e2e steps: - name: Checkout diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 49e60464..d3f398de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,7 @@ jobs: docker image ls -a push: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: e2e steps: - name: Checkout @@ -131,7 +131,7 @@ jobs: cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }} create-release: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: push steps: # To use this repository's private action, you must check out the repository From 8fc0a1d55b71fe5a50e05642d8e3eade00138f80 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 11 Aug 2023 15:11:07 +0100 Subject: [PATCH 049/161] Add note to entrypoint to warn on values See #423 --- docker-entrypoint.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index f0fa6243..7d5dea20 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -35,6 +35,13 @@ check_vars_exist \ DB_PORT \ DB_USERNAME +if [ -n "${FILE_UPLOAD_SIZE_LIMITS}" ]; then + echo "Note: If you're setting FILE_UPLOAD_SIZE_LIMITS to more than 10M, you" + echo "may also need to modify the php.ini file." + echo "See:" + echo "https://github.com/solidnerd/docker-bookstack/issues/423" +fi + echoerr "wait-for-db: waiting for ${DB_HOST_NAME}:${DB_PORT}" timeout 15 bash < Date: Sun, 3 Sep 2023 19:20:27 +0100 Subject: [PATCH 050/161] Update Bookstack to 23.08.1 --- Dockerfile | 2 +- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c595776..740da6fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.06.2 +ENV BOOKSTACK_VERSION=23.08.1 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ diff --git a/README.md b/README.md index 5eb55016..77065a25 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ## Changes -Versions higher than 23.6.2 no longer use an in-container `.env` file for +Versions higher than 23.8.1 no longer use an in-container `.env` file for environment variable management. Instead, the preferred approach is to manage them directly with the container runtime (e.g. Docker's `-e`). This is to simplify troubleshooting if and when errors occur. The most important change is @@ -67,8 +67,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_23.6.2 \ - solidnerd/bookstack:23.6.2 + --name bookstack_23.8.1 \ + solidnerd/bookstack:23.8.1 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.6.2" \ - solidnerd/bookstack:23.6.2 + --name="bookstack_23.8.1" \ + solidnerd/bookstack:23.8.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 425ffbb8..cc0b25fd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.6.2 +23.8.1 diff --git a/docker-compose.yml b/docker-compose.yml index 72c9dc55..b2d2adb6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.6.2 + image: solidnerd/bookstack:23.8.1 depends_on: - mysql environment: From fd74ca0838e083d0838ce937e297f83d1a0b90ee Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 4 Sep 2023 13:29:15 +0100 Subject: [PATCH 051/161] Update to Bookstack 23.08.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 740da6fa..ecbfc171 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.08.1 +ENV BOOKSTACK_VERSION=23.08.2 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From ea5a6c1736bb2e77a9f4be3f5a271ae2fbc6ebb0 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 4 Sep 2023 13:30:51 +0100 Subject: [PATCH 052/161] Update version information in documentation --- README.md | 10 +++++----- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 77065a25..14442d53 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ ## Changes -Versions higher than 23.8.1 no longer use an in-container `.env` file for +Versions higher than 23.6.2 no longer use an in-container `.env` file for environment variable management. Instead, the preferred approach is to manage them directly with the container runtime (e.g. Docker's `-e`). This is to simplify troubleshooting if and when errors occur. The most important change is @@ -67,8 +67,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_23.8.1 \ - solidnerd/bookstack:23.8.1 + --name bookstack_23.8.2 \ + solidnerd/bookstack:23.8.2 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.8.1" \ - solidnerd/bookstack:23.8.1 + --name="bookstack_23.8.2" \ + solidnerd/bookstack:23.8.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index cc0b25fd..1fbbb1bc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.8.1 +23.8.2 diff --git a/docker-compose.yml b/docker-compose.yml index b2d2adb6..da38a622 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.8.1 + image: solidnerd/bookstack:23.8.2 depends_on: - mysql environment: From 0d92b516e6c1eaad2480064bac82dd20bcc65151 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 12:31:17 +0000 Subject: [PATCH 053/161] Update actions/checkout action to v4 --- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1f70a118..547c12c3 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -48,7 +48,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Download artifact uses: actions/download-artifact@v3 @@ -66,7 +66,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Set up Docker Hub Image Metadata id: docker_meta diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2cbf798d..68cb2ea9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Docker meta ci id: docker_meta_ci @@ -49,7 +49,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Download artifact uses: actions/download-artifact@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d3f398de..50bddd4e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -47,7 +47,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Download artifact uses: actions/download-artifact@v3 @@ -65,7 +65,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Set up Docker Hub Image Metadata id: docker_meta @@ -136,7 +136,7 @@ jobs: steps: # To use this repository's private action, you must check out the repository - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 - name: Generate changelog id: changelog From e4f53e9586f05cd0e6219472c2f6d913b2ef32d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:36:59 +0000 Subject: [PATCH 054/161] Update docker/build-push-action action to v5 --- .github/workflows/master.yml | 4 ++-- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 547c12c3..b0fbba38 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -24,7 +24,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build Image - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile @@ -112,7 +112,7 @@ jobs: password: ${{ secrets.CR_PAT }} - name: Build and Push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 68cb2ea9..65624eb5 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,7 +24,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build and push Dev - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 50bddd4e..54befed8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Build and push Dev - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile @@ -118,7 +118,7 @@ jobs: password: ${{ secrets.CR_PAT }} - name: Build and Push master - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . file: ./Dockerfile From 8b2011ebb6e8ca48d355aa3027c2847ef70eaf49 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 10:37:03 +0000 Subject: [PATCH 055/161] Update docker/login-action action to v3 --- .github/workflows/master.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 547c12c3..56371b33 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -99,13 +99,13 @@ jobs: - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 50bddd4e..3af782f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,13 +105,13 @@ jobs: - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} From 49cb9e4a6033b5f3ae3ae8804c3472c36f4fdad7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:52:06 +0000 Subject: [PATCH 056/161] Update docker/metadata-action action to v5 --- .github/workflows/master.yml | 4 ++-- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 56371b33..8ed5f5f4 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,7 +14,7 @@ jobs: - name: Set up CI Image Metadata id: docker_meta_ci - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: solidnerd/bookstack-dev tags: | @@ -70,7 +70,7 @@ jobs: - name: Set up Docker Hub Image Metadata id: docker_meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack tags: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 68cb2ea9..992ecc8d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,7 +14,7 @@ jobs: - name: Docker meta ci id: docker_meta_ci - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: solidnerd/bookstack-dev tags: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3af782f6..22b51541 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Set up CI Image Metadata id: docker_meta_ci - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: solidnerd/bookstack-dev tags: | @@ -69,7 +69,7 @@ jobs: - name: Set up Docker Hub Image Metadata id: docker_meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | solidnerd/bookstack From 2fcaf8c10f5e1ef4b81afbbb85857234f17b86ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:52:10 +0000 Subject: [PATCH 057/161] Update docker/setup-buildx-action action to v3 --- .github/workflows/master.yml | 4 ++-- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 56371b33..dd45ea19 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -21,7 +21,7 @@ jobs: type=sha - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build Image uses: docker/build-push-action@v4 @@ -95,7 +95,7 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub if: github.event_name != 'pull_request' diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 68cb2ea9..2ac25cd1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,7 +21,7 @@ jobs: type=sha - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and push Dev uses: docker/build-push-action@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3af782f6..84f2549d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: type=sha - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and push Dev uses: docker/build-push-action@v4 @@ -101,7 +101,7 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub if: github.event_name != 'pull_request' From 9db570f6d8b106e1ffb7d4dc53962d1e45bf6e6a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 16:49:39 +0000 Subject: [PATCH 058/161] Update docker/setup-qemu-action action to v3 --- .github/workflows/master.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 8e215e1a..c65b94ab 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -92,7 +92,7 @@ jobs: docker image ls -a - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dac957c4..862dd18f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,7 +98,7 @@ jobs: docker image ls -a - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 4f8ffa1fcc6bd95b083914481188b19cfb3a8d0d Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 15 Sep 2023 17:44:49 +0100 Subject: [PATCH 059/161] Update to Bookstack 23.08.3 --- Dockerfile | 2 +- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index ecbfc171..de759644 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.08.2 +ENV BOOKSTACK_VERSION=23.08.3 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ diff --git a/README.md b/README.md index 14442d53..5108a498 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.8.2 \ - solidnerd/bookstack:23.8.2 + --name bookstack_23.8.3 \ + solidnerd/bookstack:23.8.3 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.8.2" \ - solidnerd/bookstack:23.8.2 + --name="bookstack_23.8.3" \ + solidnerd/bookstack:23.8.3 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 1fbbb1bc..fd44b030 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.8.2 +23.8.3 diff --git a/docker-compose.yml b/docker-compose.yml index da38a622..d798fd2e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.8.2 + image: solidnerd/bookstack:23.8.3 depends_on: - mysql environment: From af35ca5d7af64a889c8dafbd2c91571338ee419f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 18:42:23 +0000 Subject: [PATCH 060/161] Update actions/checkout digest to 8ade135 --- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index c65b94ab..92966577 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -48,7 +48,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Download artifact uses: actions/download-artifact@v3 @@ -66,7 +66,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Set up Docker Hub Image Metadata id: docker_meta diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6ad09470..dcd51cf2 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Docker meta ci id: docker_meta_ci @@ -49,7 +49,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Download artifact uses: actions/download-artifact@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 862dd18f..cb7f49a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -47,7 +47,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Download artifact uses: actions/download-artifact@v3 @@ -65,7 +65,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Set up Docker Hub Image Metadata id: docker_meta @@ -136,7 +136,7 @@ jobs: steps: # To use this repository's private action, you must check out the repository - name: Checkout - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 - name: Generate changelog id: changelog From be67e961f4e1dc44254a13c358efa6c73506bb96 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:30:44 +0000 Subject: [PATCH 061/161] Update actions/checkout digest to b4ffde6 --- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 92966577..fb62b2af 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -48,7 +48,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Download artifact uses: actions/download-artifact@v3 @@ -66,7 +66,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up Docker Hub Image Metadata id: docker_meta diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index dcd51cf2..5cb5d458 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Docker meta ci id: docker_meta_ci @@ -49,7 +49,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Download artifact uses: actions/download-artifact@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb7f49a1..4eaa65e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -47,7 +47,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Download artifact uses: actions/download-artifact@v3 @@ -65,7 +65,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Set up Docker Hub Image Metadata id: docker_meta @@ -136,7 +136,7 @@ jobs: steps: # To use this repository's private action, you must check out the repository - name: Checkout - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Generate changelog id: changelog From cb65e547029d329d5b4767156026d0dae5e7b5a4 Mon Sep 17 00:00:00 2001 From: reddexx Date: Mon, 30 Oct 2023 13:33:27 +0100 Subject: [PATCH 062/161] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index de759644..1fc4a083 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.08.3 +ENV BOOKSTACK_VERSION=23.10 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 02f38bb1fd59c1f9a845bb1870741de47747f791 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 30 Oct 2023 16:03:56 +0000 Subject: [PATCH 063/161] Update references to 23.10 --- 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 5108a498..9c418ece 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.8.3 \ - solidnerd/bookstack:23.8.3 + --name bookstack_23.10.0 \ + solidnerd/bookstack:23.10.0 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.8.3" \ - solidnerd/bookstack:23.8.3 + --name="bookstack_23.10.0" \ + solidnerd/bookstack:23.10.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index fd44b030..7d7a0702 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.8.3 +23.10.0 diff --git a/docker-compose.yml b/docker-compose.yml index d798fd2e..726e77c4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.8.3 + image: solidnerd/bookstack:23.10.0 depends_on: - mysql environment: From 5a1c7cd48624ef6c030cfb07c91be62f927f50b4 Mon Sep 17 00:00:00 2001 From: reddexx Date: Fri, 3 Nov 2023 12:06:59 +0100 Subject: [PATCH 064/161] Update Dockerfile Bookstack 23.10.1 Update Only Bookstack Software In Future Update PHP Container to 8.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1fc4a083..9fb28838 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.10 +ENV BOOKSTACK_VERSION=23.10.1 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 7da0c0aefb2bb36ff1de0d856ec3a17e3daa2ad4 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 3 Nov 2023 16:22:21 +0000 Subject: [PATCH 065/161] Update references to 23.10.1 --- 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 9c418ece..bfc9351c 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.10.0 \ - solidnerd/bookstack:23.10.0 + --name bookstack_23.10.1 \ + solidnerd/bookstack:23.10.1 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.10.0" \ - solidnerd/bookstack:23.10.0 + --name="bookstack_23.10.1" \ + solidnerd/bookstack:23.10.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 7d7a0702..16e4d402 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.10.0 +23.10.1 diff --git a/docker-compose.yml b/docker-compose.yml index 726e77c4..9e9974e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.10.0 + image: solidnerd/bookstack:23.10.1 depends_on: - mysql environment: From 69256c1ea78c0b6fb88751af94c82f89150accbd Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 7 Nov 2023 15:29:51 +0000 Subject: [PATCH 066/161] Update to 23.10.2 --- Dockerfile | 2 +- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9fb28838..ddb2e670 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.10.1 +ENV BOOKSTACK_VERSION=23.10.2 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ diff --git a/README.md b/README.md index bfc9351c..abf9b5c2 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.10.1 \ - solidnerd/bookstack:23.10.1 + --name bookstack_23.10.2 \ + solidnerd/bookstack:23.10.2 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.10.1" \ - solidnerd/bookstack:23.10.1 + --name="bookstack_23.10.2" \ + solidnerd/bookstack:23.10.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 16e4d402..a41796b3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.10.1 +23.10.2 diff --git a/docker-compose.yml b/docker-compose.yml index 9e9974e8..e09d3327 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.10.1 + image: solidnerd/bookstack:23.10.2 depends_on: - mysql environment: From dd0e88b10eb1d8c3a1e486fb390118c6358e2c7e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 17:02:16 +0000 Subject: [PATCH 067/161] Update metcalfc/changelog-generator action to v4.2.0 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb7f49a1..a7d46702 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -140,7 +140,7 @@ jobs: - name: Generate changelog id: changelog - uses: metcalfc/changelog-generator@v4.1.0 + uses: metcalfc/changelog-generator@v4.2.0 with: myToken: ${{ secrets.GITHUB_TOKEN }} From fdce9ebaab27e118666964481f5dc94f866ec18c Mon Sep 17 00:00:00 2001 From: reddexx Date: Mon, 20 Nov 2023 15:39:10 +0100 Subject: [PATCH 068/161] Update Dockerfile to Bookstack Version 23.10.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ddb2e670..4fed1117 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.10.2 +ENV BOOKSTACK_VERSION=23.10.4 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From a76e32d3ea00e4269e2b60891b06960404613e72 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 20 Nov 2023 14:48:54 +0000 Subject: [PATCH 069/161] Update references to 23.10.4 --- 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 abf9b5c2..ffb42c35 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.10.2 \ - solidnerd/bookstack:23.10.2 + --name bookstack_23.10.4 \ + solidnerd/bookstack:23.10.4 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.10.2" \ - solidnerd/bookstack:23.10.2 + --name="bookstack_23.10.4" \ + solidnerd/bookstack:23.10.4 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index a41796b3..f560e510 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.10.2 +23.10.4 diff --git a/docker-compose.yml b/docker-compose.yml index e09d3327..0a8749b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.10.2 + image: solidnerd/bookstack:23.10.4 depends_on: - mysql environment: From e4b6ccc0d81624fcb722c2f65369a948a6011fc6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 14:01:40 +0000 Subject: [PATCH 070/161] Update mysql Docker tag to v8.2 --- docker-compose.test.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 155d5dfa..2e161fbe 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -6,7 +6,7 @@ services: depends_on: - bookstack mysql: - image: mysql:8.1 + image: mysql:8.2 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack diff --git a/docker-compose.yml b/docker-compose.yml index 0a8749b5..33c3795d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mysql: - image: mysql:8.1 + image: mysql:8.2 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack From 476d026b345bfa73e9aff1874af9e13126f8c8b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 22:03:45 +0000 Subject: [PATCH 071/161] Update php Docker tag to v8.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4fed1117..2ca81c34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN set -x; \ && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \ && rm bookstack.tar.gz -FROM php:8.2-apache-bookworm as final +FROM php:8.3-apache-bookworm as final RUN set -x; \ apt-get update \ && apt-get install -y --no-install-recommends \ From 89aa4c538573f40d219c9864a4288c9425f85d45 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 21:13:31 +0000 Subject: [PATCH 072/161] Update {upload,download}-artifact action to v4 --- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index fb62b2af..7b838518 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -37,7 +37,7 @@ jobs: outputs: type=docker,dest=/tmp/image-bookstack.tar - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: image-bookstack-master path: /tmp/image-bookstack.tar @@ -51,7 +51,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: image-bookstack-master path: /tmp @@ -81,7 +81,7 @@ jobs: type=ref,event=branch - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: image-bookstack-master path: /tmp diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5cb5d458..1a85cb33 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -38,7 +38,7 @@ jobs: outputs: type=docker,dest=/tmp/image-bookstack.tar - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: image-bookstack path: /tmp/image-bookstack.tar @@ -52,7 +52,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: image-bookstack path: /tmp diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index daad326a..80e12bc2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: outputs: type=docker,dest=/tmp/image-bookstack.tar - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: image-bookstack-master path: /tmp/image-bookstack.tar @@ -50,7 +50,7 @@ jobs: uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: image-bookstack-master path: /tmp @@ -87,7 +87,7 @@ jobs: type=semver,pattern={{major}}.{{minor}}.{{patch}} - name: Download artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: image-bookstack-master path: /tmp From 9290e50f611c508bbbf8c13f00145f2f7883eedc Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sat, 30 Dec 2023 12:16:07 +0000 Subject: [PATCH 073/161] Update references to version 23.12.0 --- Dockerfile | 2 +- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ca81c34..4057778d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.10.4 +ENV BOOKSTACK_VERSION=23.12.0 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ diff --git a/README.md b/README.md index ffb42c35..ed5532ce 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.10.4 \ - solidnerd/bookstack:23.10.4 + --name bookstack_23.12.0 \ + solidnerd/bookstack:23.12.0 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.10.4" \ - solidnerd/bookstack:23.10.4 + --name="bookstack_23.12.0" \ + solidnerd/bookstack:23.12.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index f560e510..34291177 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.10.4 +23.12.0 diff --git a/docker-compose.yml b/docker-compose.yml index 33c3795d..bdd44f32 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.10.4 + image: solidnerd/bookstack:23.12.0 depends_on: - mysql environment: From 11a5460f7078096dee4517daade274d35d29ddeb Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sat, 30 Dec 2023 12:57:45 +0000 Subject: [PATCH 074/161] Update references to version 23.12 --- Dockerfile | 2 +- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4057778d..55d172fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.12.0 +ENV BOOKSTACK_VERSION=23.12 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ diff --git a/README.md b/README.md index ed5532ce..ba9ec214 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.12.0 \ - solidnerd/bookstack:23.12.0 + --name bookstack_23.12 \ + solidnerd/bookstack:23.12 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.12.0" \ - solidnerd/bookstack:23.12.0 + --name="bookstack_23.12" \ + solidnerd/bookstack:23.12 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 34291177..dbc391ff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.12.0 +23.12 diff --git a/docker-compose.yml b/docker-compose.yml index bdd44f32..d333c83c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.12.0 + image: solidnerd/bookstack:23.12 depends_on: - mysql environment: From cb1f0e6b4c554bdeced36a6459379aa3ae654e03 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sat, 30 Dec 2023 13:13:09 +0000 Subject: [PATCH 075/161] ci: replace deprecated GH action for releases --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 80e12bc2..82c2ade4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,12 +146,10 @@ jobs: - name: Create Release id: create_release - uses: actions/create-release@v1.1.4 + uses: softprops/action-gh-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ github.ref }} - release_name: ${{ github.ref }} body: ${{ steps.changelog.outputs.changelog }} draft: false prerelease: false From 14578e17b2e5118bc0cc9c52251e2cdf5a9d5b84 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 16 Jan 2024 12:54:06 +0000 Subject: [PATCH 076/161] Update version to 23.12.1 --- Dockerfile | 2 +- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55d172fb..af4a180c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.12 +ENV BOOKSTACK_VERSION=23.12.1 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ diff --git a/README.md b/README.md index ba9ec214..62d0efd9 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.12 \ - solidnerd/bookstack:23.12 + --name bookstack_23.12.1 \ + solidnerd/bookstack:23.12.1 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.12" \ - solidnerd/bookstack:23.12 + --name="bookstack_23.12.1" \ + solidnerd/bookstack:23.12.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index dbc391ff..e42e273b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.12 +23.12.1 diff --git a/docker-compose.yml b/docker-compose.yml index d333c83c..e9696cca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.12 + image: solidnerd/bookstack:23.12.1 depends_on: - mysql environment: From 9442774f011adbd56b00a4a7530f91ad8c6e2300 Mon Sep 17 00:00:00 2001 From: reddexx Date: Wed, 24 Jan 2024 16:18:34 +0100 Subject: [PATCH 077/161] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af4a180c..d78b029e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.12.1 +ENV BOOKSTACK_VERSION=23.12.2 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 70487f2253a79d609addb8a7754f2f592544193a Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 25 Jan 2024 12:53:51 +0000 Subject: [PATCH 078/161] Update references to 23.12.2 --- 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 62d0efd9..775326d8 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.12.1 \ - solidnerd/bookstack:23.12.1 + --name bookstack_23.12.2 \ + solidnerd/bookstack:23.12.2 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.12.1" \ - solidnerd/bookstack:23.12.1 + --name="bookstack_23.12.2" \ + solidnerd/bookstack:23.12.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index e42e273b..01766e61 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.12.1 +23.12.2 diff --git a/docker-compose.yml b/docker-compose.yml index e9696cca..0bcec105 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.12.1 + image: solidnerd/bookstack:23.12.2 depends_on: - mysql environment: From 167d00ddf933788325e3b472f58fd0183d96f6c1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 19:52:41 +0000 Subject: [PATCH 079/161] chore(deps): update metcalfc/changelog-generator action to v4.3.1 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 82c2ade4..aa396b96 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -140,7 +140,7 @@ jobs: - name: Generate changelog id: changelog - uses: metcalfc/changelog-generator@v4.2.0 + uses: metcalfc/changelog-generator@v4.3.1 with: myToken: ${{ secrets.GITHUB_TOKEN }} From 75360411dd7d313aa2c62dda7264e899413b0c7c Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 26 Feb 2024 12:19:57 +0000 Subject: [PATCH 080/161] Update references to version 23.12.3 --- Dockerfile | 2 +- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index d78b029e..805c9206 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.12.2 +ENV BOOKSTACK_VERSION=23.12.3 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ diff --git a/README.md b/README.md index 775326d8..2a08bff5 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.12.2 \ - solidnerd/bookstack:23.12.2 + --name bookstack_23.12.3 \ + solidnerd/bookstack:23.12.3 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.12.2" \ - solidnerd/bookstack:23.12.2 + --name="bookstack_23.12.3" \ + solidnerd/bookstack:23.12.3 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 01766e61..a76c9e28 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.12.2 +23.12.3 diff --git a/docker-compose.yml b/docker-compose.yml index 0bcec105..bbbe28dc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.12.2 + image: solidnerd/bookstack:23.12.3 depends_on: - mysql environment: From 591cef7ee04a6853dc24ac42bebbd3a9d770dc7d Mon Sep 17 00:00:00 2001 From: reddexx Date: Wed, 28 Feb 2024 14:56:17 +0100 Subject: [PATCH 081/161] Update Dockerfile to 24.02 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 805c9206..5189c5c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.12.3 +ENV BOOKSTACK_VERSION=24.02 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 230c7f5550176ecd2ad48a16333f5d12926383cd Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 28 Feb 2024 14:24:52 +0000 Subject: [PATCH 082/161] Update references to version 24.2 --- 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 2a08bff5..1af1caa1 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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_23.12.3 \ - solidnerd/bookstack:23.12.3 + --name bookstack_24.2.0 \ + solidnerd/bookstack:24.2.0 ``` ### Docker 1.9+ @@ -101,8 +101,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_23.12.3" \ - solidnerd/bookstack:23.12.3 + --name="bookstack_24.2.0" \ + solidnerd/bookstack:24.2.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index a76c9e28..5003ba8f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.12.3 +24.2.0 diff --git a/docker-compose.yml b/docker-compose.yml index bbbe28dc..49b862d5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.12.3 + image: solidnerd/bookstack:24.2.0 depends_on: - mysql environment: From 98fcd8bcd78dab1130bc6421badc99c1143907e8 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sun, 10 Mar 2024 22:43:58 +0000 Subject: [PATCH 083/161] Update to 24.2.1 --- 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 1af1caa1..30efd110 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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.2.0 \ - solidnerd/bookstack:24.2.0 + --name bookstack_24.2.1 \ + solidnerd/bookstack:24.2.1 ``` ### Docker 1.9+ @@ -101,8 +101,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.2.0" \ - solidnerd/bookstack:24.2.0 + --name="bookstack_24.2.1" \ + solidnerd/bookstack:24.2.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 5003ba8f..8fadab05 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.2.0 +24.2.1 diff --git a/docker-compose.yml b/docker-compose.yml index 49b862d5..ca0ab582 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.2.0 + image: solidnerd/bookstack:24.2.1 depends_on: - mysql environment: From 807b24b6aa421f4f482e23c579f72dec5ddfc955 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 Mar 2024 22:50:45 +0000 Subject: [PATCH 084/161] chore(deps): update softprops/action-gh-release action to v2 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa396b96..3c09ca89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -146,7 +146,7 @@ jobs: - name: Create Release id: create_release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From 4739815da3daecc198f6cab4146055ccffd50a61 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 11 Mar 2024 14:37:44 +0000 Subject: [PATCH 085/161] Update to 24.2.2 --- 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 30efd110..f8a31bb1 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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.2.1 \ - solidnerd/bookstack:24.2.1 + --name bookstack_24.2.2 \ + solidnerd/bookstack:24.2.2 ``` ### Docker 1.9+ @@ -101,8 +101,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.2.1" \ - solidnerd/bookstack:24.2.1 + --name="bookstack_24.2.2" \ + solidnerd/bookstack:24.2.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 8fadab05..33a178b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.2.1 +24.2.2 diff --git a/docker-compose.yml b/docker-compose.yml index ca0ab582..226a8950 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.2.1 + image: solidnerd/bookstack:24.2.2 depends_on: - mysql environment: From fae8fe10ecf826945850b9f2f0fcb3f774c2dcca Mon Sep 17 00:00:00 2001 From: reddexx Date: Wed, 13 Mar 2024 09:42:15 +0100 Subject: [PATCH 086/161] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5189c5c6..7669baec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=24.02 +ENV BOOKSTACK_VERSION=24.02.2 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 7c78982ee43bd646a2409927d28d9d34f3bd7894 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 13 Mar 2024 11:39:37 +0000 Subject: [PATCH 087/161] feat: update references to 24.02.2 --- 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 f8a31bb1..44b6217b 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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.2.2 \ - solidnerd/bookstack:24.2.2 + --name bookstack_24.02.2 \ + solidnerd/bookstack:24.02.2 ``` ### Docker 1.9+ @@ -101,8 +101,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.2.2" \ - solidnerd/bookstack:24.2.2 + --name="bookstack_24.02.2" \ + solidnerd/bookstack:24.02.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 33a178b8..9cf0563c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.2.2 +24.02.2 diff --git a/docker-compose.yml b/docker-compose.yml index 226a8950..c6a1355c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.2.2 + image: solidnerd/bookstack:24.02.2 depends_on: - mysql environment: From 4087e7cec5ba993b3c4766aea3f2810020e50399 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 13 Mar 2024 11:45:05 +0000 Subject: [PATCH 088/161] fix: correct references to most recent SemVer --- 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 44b6217b..f8a31bb1 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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.02.2 \ - solidnerd/bookstack:24.02.2 + --name bookstack_24.2.2 \ + solidnerd/bookstack:24.2.2 ``` ### Docker 1.9+ @@ -101,8 +101,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.02.2" \ - solidnerd/bookstack:24.02.2 + --name="bookstack_24.2.2" \ + solidnerd/bookstack:24.2.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 9cf0563c..33a178b8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.02.2 +24.2.2 diff --git a/docker-compose.yml b/docker-compose.yml index c6a1355c..226a8950 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.02.2 + image: solidnerd/bookstack:24.2.2 depends_on: - mysql environment: From 2adea86ecfdcb11d083899637e8bff328cd29484 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 21 Mar 2024 10:40:36 +0000 Subject: [PATCH 089/161] chore(deps): update mysql docker tag to v8.3 --- docker-compose.test.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 2e161fbe..12b773a9 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -6,7 +6,7 @@ services: depends_on: - bookstack mysql: - image: mysql:8.2 + image: mysql:8.3 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack diff --git a/docker-compose.yml b/docker-compose.yml index 226a8950..f6621fd7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mysql: - image: mysql:8.2 + image: mysql:8.3 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack From 7e776020cb12389064d19d5c37006629544ea72d Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 5 Apr 2024 16:05:04 +0100 Subject: [PATCH 090/161] feat: update to Bookstack 24.02.3 --- Dockerfile | 2 +- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7669baec..585e7642 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=24.02.2 +ENV BOOKSTACK_VERSION=23.02.3 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ diff --git a/README.md b/README.md index f8a31bb1..d01af33a 100644 --- a/README.md +++ b/README.md @@ -67,8 +67,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.2.2 \ - solidnerd/bookstack:24.2.2 + --name bookstack_23.2.3 \ + solidnerd/bookstack:23.2.3 ``` ### Docker 1.9+ @@ -101,8 +101,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.2.2" \ - solidnerd/bookstack:24.2.2 + --name="bookstack_23.2.3" \ + solidnerd/bookstack:23.2.3 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 33a178b8..2d436a3c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.2.2 +23.2.3 diff --git a/docker-compose.yml b/docker-compose.yml index f6621fd7..0ef9807e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.2.2 + image: solidnerd/bookstack:23.2.3 depends_on: - mysql environment: From 697051561d35999cbe9b1198ad3f515d5f66cbd1 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sun, 14 Apr 2024 21:02:21 +0100 Subject: [PATCH 091/161] fix: correct Bookstack version to 24.x The previous release I had a typo in my `sed` expression which reverted to Bookstack version to 23.2.3. Reported in #479 --- README.md | 11 +++++++---- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d01af33a..86522353 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,9 @@ ## Changes +Users of version 24.2.3 should switch to 24.2.3-1 (or higher); a maintainer +erroneously set image tag 24.2.3 to use 23.2.3 as the release. + Versions higher than 23.6.2 no longer use an in-container `.env` file for environment variable management. Instead, the preferred approach is to manage them directly with the container runtime (e.g. Docker's `-e`). This is to @@ -67,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_23.2.3 \ - solidnerd/bookstack:23.2.3 + --name bookstack_24.2.3 \ + solidnerd/bookstack:24.2.3 ``` ### Docker 1.9+ @@ -101,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_23.2.3" \ - solidnerd/bookstack:23.2.3 + --name="bookstack_24.2.3" \ + solidnerd/bookstack:24.2.3 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 2d436a3c..fae1bfa3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -23.2.3 +24.2.3 diff --git a/docker-compose.yml b/docker-compose.yml index 0ef9807e..9bd8182b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:23.2.3 + image: solidnerd/bookstack:24.2.3 depends_on: - mysql environment: From e9dd3681146e6ba2f7db285aac9faf2d1bc0bed8 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sun, 14 Apr 2024 21:05:19 +0100 Subject: [PATCH 092/161] feat: update documentation to reflect bumped build number --- README.md | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 86522353..7708659f 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Networking changed in Docker v1.9, so you need to do one of the following steps. docker run -d --link bookstack_db_:mysql \ -p 8080:8080 \ --name bookstack_24.2.3 \ - solidnerd/bookstack:24.2.3 + solidnerd/bookstack:24.2.3-1 ``` ### Docker 1.9+ @@ -105,7 +105,7 @@ Networking changed in Docker v1.9, so you need to do one of the following steps. -e APP_URL=http://example.com \ -p 8080:8080 \ --name="bookstack_24.2.3" \ - solidnerd/bookstack:24.2.3 + solidnerd/bookstack:24.2.3-1 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/docker-compose.yml b/docker-compose.yml index 9bd8182b..7b48bb2b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.2.3 + image: solidnerd/bookstack:24.2.3-1 depends_on: - mysql environment: From af83bc765c8cb8e31d3636ecf978f9e2c8604821 Mon Sep 17 00:00:00 2001 From: andremohr <62677846+andremohr@users.noreply.github.com> Date: Tue, 16 Apr 2024 10:13:07 +0200 Subject: [PATCH 093/161] fix: Correct BOOKSTACK_VERSION in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 585e7642..a442aa8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=23.02.3 +ENV BOOKSTACK_VERSION=24.02.3 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 93dbaa5ad4c0ae10e6909d84b19902b5473d6c46 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 16:52:50 +0000 Subject: [PATCH 094/161] chore(deps): update actions/checkout digest to 1d96c77 --- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7b838518..4aec8337 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -48,7 +48,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Download artifact uses: actions/download-artifact@v4 @@ -66,7 +66,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Set up Docker Hub Image Metadata id: docker_meta diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1a85cb33..48412804 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Docker meta ci id: docker_meta_ci @@ -49,7 +49,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Download artifact uses: actions/download-artifact@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3c09ca89..eba9503a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -47,7 +47,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Download artifact uses: actions/download-artifact@v4 @@ -65,7 +65,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Set up Docker Hub Image Metadata id: docker_meta @@ -136,7 +136,7 @@ jobs: steps: # To use this repository's private action, you must check out the repository - name: Checkout - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 - name: Generate changelog id: changelog From 27c9dfdb4e1f3c91126a414c5b2f75d33bccc064 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 15:12:15 +0000 Subject: [PATCH 095/161] chore(deps): update actions/checkout digest to 0ad4b8f --- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 4aec8337..d2030f01 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -48,7 +48,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Download artifact uses: actions/download-artifact@v4 @@ -66,7 +66,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Set up Docker Hub Image Metadata id: docker_meta diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 48412804..7283c5f8 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Docker meta ci id: docker_meta_ci @@ -49,7 +49,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Download artifact uses: actions/download-artifact@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index eba9503a..6347f894 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -47,7 +47,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Download artifact uses: actions/download-artifact@v4 @@ -65,7 +65,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Set up Docker Hub Image Metadata id: docker_meta @@ -136,7 +136,7 @@ jobs: steps: # To use this repository's private action, you must check out the repository - name: Checkout - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 - name: Generate changelog id: changelog From a5c56f29b3839aa0df071671909fc12e7d456608 Mon Sep 17 00:00:00 2001 From: reddexx Date: Mon, 13 May 2024 08:54:20 +0200 Subject: [PATCH 096/161] Update Bookstack to 24.05 and Composer V2.2.23 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a442aa8b..a8647641 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=24.02.3 +ENV BOOKSTACK_VERSION=24.05 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ @@ -54,7 +54,7 @@ COPY bookstack.conf /etc/apache2/sites-available/000-default.conf COPY --from=bookstack --chown=33:33 /bookstack/ /var/www/bookstack/ -ARG COMPOSER_VERSION=2.1.12 +ARG COMPOSER_VERSION=2.2.23 RUN set -x; \ cd /var/www/bookstack \ && curl -sS https://getcomposer.org/installer | php -- --version=$COMPOSER_VERSION \ From 69c01a0cf8e112d8fc6a843d2e55ed9e780c6746 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 13 May 2024 08:03:05 +0100 Subject: [PATCH 097/161] feat: update Composer to latest release Documentation states that running the latest version - rather than close to the required version - is best practise, so update that. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a8647641..15c7abed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,7 +54,7 @@ COPY bookstack.conf /etc/apache2/sites-available/000-default.conf COPY --from=bookstack --chown=33:33 /bookstack/ /var/www/bookstack/ -ARG COMPOSER_VERSION=2.2.23 +ARG COMPOSER_VERSION=2.7.6 RUN set -x; \ cd /var/www/bookstack \ && curl -sS https://getcomposer.org/installer | php -- --version=$COMPOSER_VERSION \ From 795e076825fec1a110524b8763c5f0f62e608e5e Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 13 May 2024 08:14:05 +0100 Subject: [PATCH 098/161] feat: update references to 24.5.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 7708659f..434d08c1 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.2.3 \ - solidnerd/bookstack:24.2.3-1 + --name bookstack_24.5.0 \ + solidnerd/bookstack:24.5.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.2.3" \ - solidnerd/bookstack:24.2.3-1 + --name="bookstack_24.5.0" \ + solidnerd/bookstack:24.5.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index fae1bfa3..341cb506 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.2.3 +24.5.0 diff --git a/docker-compose.yml b/docker-compose.yml index 7b48bb2b..10da6ed8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.2.3-1 + image: solidnerd/bookstack:24.5.0 depends_on: - mysql environment: From e5333d518e8dfb75a30dd12bf5564c97095c731d Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 13 May 2024 08:18:28 +0100 Subject: [PATCH 099/161] doc: improve release documentation --- RELEASE.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 0f76d129..9b5e98d8 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -9,10 +9,14 @@ It may also be useful to update documentation references at the same time. For Bookstack version 23.01: ```shell -sed -i '' -e 's/22.11.1/23.1.0/g' * # 22.11.1 was the previous version -git commit -am "Update references to version 23.1.0" [-S] +sed -i '' -e 's/22.11.1/23.1.0/g' Dockerfile # 22.11.1 was the previous version +git commit -am "feat: Update Bookstack to version 23.1.0" [-S] +# Build and test this git tag [-s] -a 23.1.0 -m "Release version 23.01" git push --tags +sed -i '' -e 's/22.11.1/23.1.0/g' * # Update documentation to point to the +newer release +git commit -am "doc: update references to version 23.1" ``` The workflow will then build, test, push, and release this image. From 34fd456d3293927d6a9502f2c50d1f16e4b11da5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 17:22:42 +0000 Subject: [PATCH 100/161] chore(deps): update actions/checkout digest to a5ac7e5 --- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index d2030f01..4b3e133f 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -48,7 +48,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Download artifact uses: actions/download-artifact@v4 @@ -66,7 +66,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Set up Docker Hub Image Metadata id: docker_meta diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 7283c5f8..3a0f9791 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Docker meta ci id: docker_meta_ci @@ -49,7 +49,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Download artifact uses: actions/download-artifact@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6347f894..dbc502fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -47,7 +47,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Download artifact uses: actions/download-artifact@v4 @@ -65,7 +65,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Set up Docker Hub Image Metadata id: docker_meta @@ -136,7 +136,7 @@ jobs: steps: # To use this repository's private action, you must check out the repository - name: Checkout - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 - name: Generate changelog id: changelog From 074989d056040a68a30bf9fdac5f038f94a778c2 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 21 May 2024 12:59:20 +0100 Subject: [PATCH 101/161] feat: update Bookstack to 24.05.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 15c7abed..4c7c36d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=24.05 +ENV BOOKSTACK_VERSION=24.05.1 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 9b45ee2f7c664090a96641abc98db1083661fcef Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 21 May 2024 13:01:21 +0100 Subject: [PATCH 102/161] doc: update references to version 24.5.1 --- 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 434d08c1..5c0dbaf4 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.5.0 \ - solidnerd/bookstack:24.5.0 + --name bookstack_24.5.1 \ + solidnerd/bookstack:24.5.1 ``` ### 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.5.0" \ - solidnerd/bookstack:24.5.0 + --name="bookstack_24.5.1" \ + solidnerd/bookstack:24.5.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 341cb506..023b48bb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.5.0 +24.5.1 diff --git a/docker-compose.yml b/docker-compose.yml index 10da6ed8..e7242027 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.5.0 + image: solidnerd/bookstack:24.5.1 depends_on: - mysql environment: From bc3e25edbe11b259eb0f0b3d838a1f24e95767a7 Mon Sep 17 00:00:00 2001 From: reddexx Date: Mon, 10 Jun 2024 14:06:46 +0200 Subject: [PATCH 103/161] Update Bookstack to 24.05.2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e7242027..e802ba34 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.5.1 + image: solidnerd/bookstack:24.5.2 depends_on: - mysql environment: From a990b5c88e9062ab95d25ac409df95e221b51e69 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 10 Jun 2024 14:07:44 +0100 Subject: [PATCH 104/161] doc: update references to version 24.5.2 --- README.md | 8 ++++---- VERSION | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 5c0dbaf4..7a0b2aa0 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.5.1 \ - solidnerd/bookstack:24.5.1 + --name bookstack_24.5.2 \ + solidnerd/bookstack:24.5.2 ``` ### 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.5.1" \ - solidnerd/bookstack:24.5.1 + --name="bookstack_24.5.2" \ + solidnerd/bookstack:24.5.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 023b48bb..582c8a58 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.5.1 +24.5.2 From 70048fcbc1f29741a4dda20717e6af47bef22762 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 11 Jun 2024 10:09:39 +0100 Subject: [PATCH 105/161] feat: remove wkhtml (see #498) --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4c7c36d8..37d474c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,10 +27,6 @@ RUN set -x; \ curl \ libzip-dev \ unzip \ - && wget -O wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb \ - && chmod a+x ./wkhtmltox.deb \ - && apt-get install -y ./wkhtmltox.deb \ - && rm ./wkhtmltox.deb \ && docker-php-ext-install -j$(nproc) dom pdo pdo_mysql zip tidy \ && docker-php-ext-configure ldap \ && docker-php-ext-install -j$(nproc) ldap \ From cb70eeee05ccd3dcc0b0430444a38ca4cd6c481d Mon Sep 17 00:00:00 2001 From: andremohr <62677846+andremohr@users.noreply.github.com> Date: Thu, 13 Jun 2024 16:24:28 +0200 Subject: [PATCH 106/161] fix: Correct BOOKSTACK_VERSION in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 37d474c9..caaf657b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=24.05.1 +ENV BOOKSTACK_VERSION=24.05.2 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From 171560c6883c510e0be6d9d4646fb211f88a49c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:54:44 +0000 Subject: [PATCH 107/161] chore(deps): update docker/build-push-action action to v6 --- .github/workflows/master.yml | 4 ++-- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 4b3e133f..1dbace48 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -24,7 +24,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build Image - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile @@ -112,7 +112,7 @@ jobs: password: ${{ secrets.CR_PAT }} - name: Build and Push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3a0f9791..e6db2310 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -24,7 +24,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build and push Dev - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dbc502fb..a6c77bde 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build and push Dev - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile @@ -118,7 +118,7 @@ jobs: password: ${{ secrets.CR_PAT }} - name: Build and Push master - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile From 45987e8e40b4b1d374653e096673670f4b2aeebc Mon Sep 17 00:00:00 2001 From: reddexx Date: Mon, 15 Jul 2024 08:58:33 +0200 Subject: [PATCH 108/161] Update Dockerfile Update to 24.05.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index caaf657b..eae5dc28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=24.05.2 +ENV BOOKSTACK_VERSION=24.05.3 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From b7cdb5e33756bfa2c88ae99f91d1f2d887705166 Mon Sep 17 00:00:00 2001 From: andremohr <62677846+andremohr@users.noreply.github.com> Date: Tue, 23 Jul 2024 15:37:49 +0200 Subject: [PATCH 109/161] fix: correct bookstack version --- 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 7a0b2aa0..3b479668 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.5.2 \ - solidnerd/bookstack:24.5.2 + --name bookstack_24.5.3 \ + solidnerd/bookstack:24.5.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.5.2" \ - solidnerd/bookstack:24.5.2 + --name="bookstack_24.5.3" \ + solidnerd/bookstack:24.5.3 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 582c8a58..83fde046 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.5.2 +24.5.3 diff --git a/docker-compose.yml b/docker-compose.yml index e802ba34..02a98ef9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.5.2 + image: solidnerd/bookstack:24.5.3 depends_on: - mysql environment: From cf645b8361991a8a5266ef15a0b07b69b08290dd Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 29 Aug 2024 17:18:44 +0100 Subject: [PATCH 110/161] feat: update to Bookstack 24.05.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eae5dc28..ad09587b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=24.05.3 +ENV BOOKSTACK_VERSION=24.05.4 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From c9e4ba55bb9e4b089b12c06564fb1ee3c720afa3 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 29 Aug 2024 17:22:36 +0100 Subject: [PATCH 111/161] doc: update references to 24.5.4 --- 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 3b479668..8cc39e55 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.5.3 \ - solidnerd/bookstack:24.5.3 + --name bookstack_24.5.4 \ + solidnerd/bookstack:24.5.4 ``` ### 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.5.3" \ - solidnerd/bookstack:24.5.3 + --name="bookstack_24.5.4" \ + solidnerd/bookstack:24.5.4 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 83fde046..7d66b9a5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.5.3 +24.5.4 diff --git a/docker-compose.yml b/docker-compose.yml index 02a98ef9..8f03a1b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.5.3 + image: solidnerd/bookstack:24.5.4 depends_on: - mysql environment: From aa520092491b1d1988d246bfac64f1626802abba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Mohr?= <62677846+andremohr@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:09:05 +0200 Subject: [PATCH 112/161] feat: update to Bookstack 24.10 --- Dockerfile | 2 +- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad09587b..96891501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=24.05.4 +ENV BOOKSTACK_VERSION=24.10 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ diff --git a/README.md b/README.md index 8cc39e55..7765d09c 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.5.4 \ - solidnerd/bookstack:24.5.4 + --name bookstack_24.10.0 \ + solidnerd/bookstack:24.10.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.5.4" \ - solidnerd/bookstack:24.5.4 + --name="bookstack_24.10.0" \ + solidnerd/bookstack:24.10.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 7d66b9a5..21651351 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.5.4 +24.10.0 diff --git a/docker-compose.yml b/docker-compose.yml index 8f03a1b8..76d72e3b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.5.4 + image: solidnerd/bookstack:24.10.0 depends_on: - mysql environment: From ae10647dd0358f676e646dffd9d106489bbd3190 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Oct 2024 16:27:30 +0000 Subject: [PATCH 113/161] chore(deps): update actions/checkout digest to 11bd719 --- .github/workflows/master.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .github/workflows/release.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 1dbace48..5f0afa52 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -48,7 +48,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Download artifact uses: actions/download-artifact@v4 @@ -66,7 +66,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Set up Docker Hub Image Metadata id: docker_meta diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e6db2310..d1bf1e42 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Docker meta ci id: docker_meta_ci @@ -49,7 +49,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Download artifact uses: actions/download-artifact@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a6c77bde..3ad0b3cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Set up CI Image Metadata id: docker_meta_ci @@ -47,7 +47,7 @@ jobs: needs: build steps: - name: Checkout - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Download artifact uses: actions/download-artifact@v4 @@ -65,7 +65,7 @@ jobs: needs: e2e steps: - name: Checkout - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Set up Docker Hub Image Metadata id: docker_meta @@ -136,7 +136,7 @@ jobs: steps: # To use this repository's private action, you must check out the repository - name: Checkout - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 - name: Generate changelog id: changelog From 34fefb1e1e6c30a06609937ab38481ce49826bda Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 8 Nov 2024 14:04:39 +0000 Subject: [PATCH 114/161] chore(deps): update dependency ubuntu to v24 --- .github/workflows/master.yml | 2 +- .github/workflows/release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 5f0afa52..aa4dcbcf 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -62,7 +62,7 @@ jobs: docker image ls -a push: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: e2e steps: - name: Checkout diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ad0b3cd..e7448e64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -61,7 +61,7 @@ jobs: docker image ls -a push: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: e2e steps: - name: Checkout @@ -131,7 +131,7 @@ jobs: cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }} create-release: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: push steps: # To use this repository's private action, you must check out the repository From 5e35db84a6d6befcecd1eb75b393d0e403c9b2d4 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 8 Nov 2024 14:05:47 +0000 Subject: [PATCH 115/161] feat: Update Bookstack to version 24.10.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 96891501..fb96a2cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 as bookstack -ENV BOOKSTACK_VERSION=24.10 +ENV BOOKSTACK_VERSION=24.10.1 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From caa3dfab1b68100a58cd27ef47d0b85980c39dfe Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 8 Nov 2024 14:13:30 +0000 Subject: [PATCH 116/161] doc: update references to version 24.10.1 --- 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 7765d09c..312ca5f6 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.0 \ - solidnerd/bookstack:24.10.0 + --name bookstack_24.10.1 \ + solidnerd/bookstack:24.10.1 ``` ### 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.0" \ - solidnerd/bookstack:24.10.0 + --name="bookstack_24.10.1" \ + solidnerd/bookstack:24.10.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 21651351..169a8dd8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.10.0 +24.10.1 diff --git a/docker-compose.yml b/docker-compose.yml index 76d72e3b..38d6c972 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.0 + image: solidnerd/bookstack:24.10.1 depends_on: - mysql environment: From 75b04db6b8e0601c6709c634d4cae6dcf9881af3 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 8 Nov 2024 14:35:48 +0000 Subject: [PATCH 117/161] lint: match case for 'FROM' and 'AS' in Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index fb96a2cb..1d3551f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3 as bookstack +FROM alpine:3 AS bookstack ENV BOOKSTACK_VERSION=24.10.1 RUN apk add --no-cache curl tar RUN set -x; \ @@ -7,7 +7,7 @@ RUN set -x; \ && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \ && rm bookstack.tar.gz -FROM php:8.3-apache-bookworm as final +FROM php:8.3-apache-bookworm AS final RUN set -x; \ apt-get update \ && apt-get install -y --no-install-recommends \ From 6177d49bf21fde204f751a190010678d5042eedf Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 8 Nov 2024 14:46:55 +0000 Subject: [PATCH 118/161] ci: switch to docker compose from docker-compose --- Makefile | 6 +++--- README.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index c5a00a55..ded68cbf 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ push-release: e2e: - @BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml up -d - @BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml run --rm sut - @BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker-compose -f docker-compose.test.yml down -v + @BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker compose -f docker-compose.test.yml up -d + @BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker compose -f docker-compose.test.yml run --rm sut + @BOOKSTACK_IMAGE="$(DOCKER_RELEASE_REG)/${DOCKER_IMAGE_DEV}:${DOCKER_INTERNAL_TAG}" docker compose -f docker-compose.test.yml down -v diff --git a/README.md b/README.md index 312ca5f6..5b5fa242 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ In 0.12.2 we removed `DB_PORT` . You can now specify the port via `DB_HOST` like With Docker Compose is a Quickstart very easy. Run the following command: ```bash -docker-compose up +docker compose up ``` and after that open your Browser and go to From a728c658db0b7ebbfc12d6146c2f55e4fbdf0594 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 13 Nov 2024 13:03:32 +0000 Subject: [PATCH 119/161] feat: update Dockerfile to use Bookstack v24.10.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1d3551f7..05168b47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=24.10.1 +ENV BOOKSTACK_VERSION=24.10.2 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ From d94590fd94b031bbbfdf609e192ca5b35076a66c Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 13 Nov 2024 13:09:09 +0000 Subject: [PATCH 120/161] doc: update documentation to use 24.10.2 --- 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 5b5fa242..044cbc86 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.1 \ - solidnerd/bookstack:24.10.1 + --name bookstack_24.10.2 \ + solidnerd/bookstack:24.10.2 ``` ### 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.1" \ - solidnerd/bookstack:24.10.1 + --name="bookstack_24.10.2" \ + solidnerd/bookstack:24.10.2 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 169a8dd8..95795064 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.10.1 +24.10.2 diff --git a/docker-compose.yml b/docker-compose.yml index 38d6c972..7dc7ecca 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.1 + image: solidnerd/bookstack:24.10.2 depends_on: - mysql environment: From 483baebe7a6b9f0a7d4285d1541c0f95749dbfa6 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 13 Jun 2024 16:14:23 +0100 Subject: [PATCH 121/161] refactor: use true tag name for BOOKSTACK_VERSION This allows the latest tag to be fetched from GitHub's API and used directly, instead of requiring parsing. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 05168b47..fe60b0c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=24.10.2 +ENV BOOKSTACK_VERSION=v24.10.2 RUN apk add --no-cache curl tar RUN set -x; \ - curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz \ + curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz \ && mkdir -p /bookstack \ && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \ && rm bookstack.tar.gz From c37d6b8a87b13c23473d39e9485b1366d070d0ba Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 13 Jun 2024 16:16:44 +0100 Subject: [PATCH 122/161] feat: create script to update Dockerfile --- scripts/update_dockerfile.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 scripts/update_dockerfile.sh diff --git a/scripts/update_dockerfile.sh b/scripts/update_dockerfile.sh new file mode 100755 index 00000000..32c93b60 --- /dev/null +++ b/scripts/update_dockerfile.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +BOOKSTACK_VERSION=$(curl -L \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + https://api.github.com/repos/BookstackApp/Bookstack/releases/latest | \ + jq -r .tag_name +) + +echo "Latest: ${BOOKSTACK_VERSION}. Updating.." + +sed \ + -i '' \ + -e "s/^ENV BOOKSTACK_VERSION=.*/ENV BOOKSTACK_VERSION=${BOOKSTACK_VERSION}/" \ + Dockerfile From 31d55d7f9960de66ff0356e4b581384aac139ccb Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 13 Jun 2024 16:58:12 +0100 Subject: [PATCH 123/161] feat: start adding tags with new versions --- scripts/update_dockerfile.sh | 13 +++++++++++-- scripts/update_tags_and_docs.sh | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100755 scripts/update_tags_and_docs.sh diff --git a/scripts/update_dockerfile.sh b/scripts/update_dockerfile.sh index 32c93b60..e203e0ff 100755 --- a/scripts/update_dockerfile.sh +++ b/scripts/update_dockerfile.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +echo "Fetching latest Bookstack release from GitHub API" + BOOKSTACK_VERSION=$(curl -L \ -H "Accept: application/vnd.github+json" \ -H "X-GitHub-Api-Version: 2022-11-28" \ @@ -7,9 +9,16 @@ BOOKSTACK_VERSION=$(curl -L \ jq -r .tag_name ) -echo "Latest: ${BOOKSTACK_VERSION}. Updating.." +echo "Found latest version: ${BOOKSTACK_VERSION}" + +# Get the root of the Git repository in order to correctly path e.g. Dockerfile +GIT_ROOT=$(git rev-parse --show-toplevel) +echo "Updating Dockerfile.." sed \ -i '' \ -e "s/^ENV BOOKSTACK_VERSION=.*/ENV BOOKSTACK_VERSION=${BOOKSTACK_VERSION}/" \ - Dockerfile + "${GIT_ROOT}/Dockerfile" + +git add "${GIT_ROOT}/Dockerfile" +git commit -S -m "feat: update Dockerfile to use Bookstack ${BOOKSTACK_VERSION}" diff --git a/scripts/update_tags_and_docs.sh b/scripts/update_tags_and_docs.sh new file mode 100755 index 00000000..a090452c --- /dev/null +++ b/scripts/update_tags_and_docs.sh @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +# Get the root of the Git repository in order to correctly path e.g. Dockerfile +GIT_ROOT=$(git rev-parse --show-toplevel) + +# Extract the version from the Dockerfile, as there could have been a new +# release since the last run. + +BOOKSTACK_VERSION=$(awk \ + '/ENV BOOKSTACK_VERSION/{split($2,b,"="); print b[2]}' \ + "${GIT_ROOT}/Dockerfile" +) + +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/.}" + +echo "Tag name: ${BOOKSTACK_VERSION}" + +git tag -s -a "${BOOKSTACK_VERSION}" -m "Release version ${BOOKSTACK_VERSION}" +git push --tags + +# TODO: Sort VERSION file +# TODO: Update README version +# TODO: Update docker-compose From 9a4aa4533921f2acf05e8b4b838c3ee225483a6b Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Fri, 8 Nov 2024 14:34:30 +0000 Subject: [PATCH 124/161] doc: use update script in release doc --- RELEASE.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/RELEASE.md b/RELEASE.md index 9b5e98d8..0db7ced4 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -4,6 +4,20 @@ When the version changes, a new release should be cut. To do this, push a tag with the [valid SemVer][semver-checker] version number as the tag. It may also be useful to update documentation references at the same time. +## Scripts + +Update the Dockerfile with: + +```shell +$ scripts/update_dockerfile.sh +Fetching latest Bookstack release from GitHub API + % Total % Received % Xferd Average Speed Time Time Time Current + Dload Upload Total Spent Left Speed +100 3467 100 3467 0 0 18743 0 --:--:-- --:--:-- --:--:-- 18842 +Found latest version: v24.10.1 +Updating Dockerfile.. +``` + ## Example For Bookstack version 23.01: From e64ed8397e04aa2fee023f198e64ef21d765d9f1 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 13 Nov 2024 13:29:05 +0000 Subject: [PATCH 125/161] feat: update documentation in release scripts --- scripts/update_tags_and_docs.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/scripts/update_tags_and_docs.sh b/scripts/update_tags_and_docs.sh index a090452c..1d4afccf 100755 --- a/scripts/update_tags_and_docs.sh +++ b/scripts/update_tags_and_docs.sh @@ -25,6 +25,23 @@ echo "Tag name: ${BOOKSTACK_VERSION}" git tag -s -a "${BOOKSTACK_VERSION}" -m "Release version ${BOOKSTACK_VERSION}" git push --tags -# TODO: Sort VERSION file -# TODO: Update README version -# TODO: Update docker-compose +echo "Extracting old version info.." +OLD_BS_VERSION="$(cat VERSION)" + +echo "Updating README and reference docker-compose.yml.." +sed \ + -i '' \ + -e "s/${OLD_BS_VERSION}/${BOOKSTACK_VERSION}/g" \ + "${GIT_ROOT}/README.md" \ + "${GIT_ROOT}/docker-compose.yml" + +echo "Updating VERSION file.." +echo "${BOOKSTACK_VERSION}" > "${GIT_ROOT}/VERSION" + +git add \ + "${GIT_ROOT}/README.md" \ + "${GIT_ROOT}/docker-compose.yml" \ + "${GIT_ROOT}/VERSION" + +git commit -S -m "doc: update documentation to reference ${BOOKSTACK_VERSION}" +git push From dfecafcbb5e8084fb6997113c35bfa8f1c70b4ff Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sat, 30 Nov 2024 01:14:12 +0000 Subject: [PATCH 126/161] feat: update Dockerfile to use Bookstack v24.10.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fe60b0c4..645f89da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v24.10.2 +ENV BOOKSTACK_VERSION=v24.10.3 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 7095a1a7ce9ab0d30cc4af6a17344e0174f2f4e3 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sat, 30 Nov 2024 01:20:42 +0000 Subject: [PATCH 127/161] doc: update documentation to reference 24.10.3 --- 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 044cbc86..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.10.2 \ - solidnerd/bookstack:24.10.2 + --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.10.2" \ - solidnerd/bookstack:24.10.2 + --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 95795064..7c77343c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.10.2 +24.10.3 diff --git a/docker-compose.yml b/docker-compose.yml index 7dc7ecca..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.10.2 + image: solidnerd/bookstack:24.10.3 depends_on: - mysql environment: From 0eb2ff92e5cfcff08846b29d33b6946177e92ae8 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 23 Dec 2024 12:59:49 +0000 Subject: [PATCH 128/161] 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 129/161] 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 130/161] 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 131/161] 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 132/161] 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: From 091295c4c3cf3076d7736c7f5a4c22be483c7791 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sun, 5 Jan 2025 11:35:22 +0000 Subject: [PATCH 133/161] feat: update Dockerfile to use Bookstack v24.12.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e0d0e7bb..09e6cc77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v24.12 +ENV BOOKSTACK_VERSION=v24.12.1 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 a60cedeab11886c9476e7ff716984ad4bb6328da Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sun, 5 Jan 2025 11:38:53 +0000 Subject: [PATCH 134/161] doc: update documentation to reference 24.12.1 --- 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 e5844a33..4be5d8a5 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.0 \ - solidnerd/bookstack:24.12.0 + --name bookstack_24.12.1 \ + solidnerd/bookstack:24.12.1 ``` ### 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.0" \ - solidnerd/bookstack:24.12.0 + --name="bookstack_24.12.1" \ + solidnerd/bookstack:24.12.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 248216ad..58dde6ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.12.0 +24.12.1 diff --git a/docker-compose.yml b/docker-compose.yml index 6246d390..1f6c903d 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.0 + image: solidnerd/bookstack:24.12.1 depends_on: - mysql environment: From 40a27d58e162f63142d02d498acb808a39f1cb2e Mon Sep 17 00:00:00 2001 From: Grzegorz Skornowicz Date: Tue, 18 Feb 2025 21:02:12 +0100 Subject: [PATCH 135/161] adjust php memory limit --- php.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php.ini b/php.ini index 8c04c367..3b9c045a 100644 --- a/php.ini +++ b/php.ini @@ -1,4 +1,4 @@ [PHP] - +memory_limit = 256M post_max_size = 10M upload_max_filesize = 10M From 359b53a83af5f8d97496a02ad2cc07cb9689edd1 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 26 Feb 2025 15:51:16 +0000 Subject: [PATCH 136/161] feat: update Dockerfile to use Bookstack v25.02 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 09e6cc77..573b7961 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v24.12.1 +ENV BOOKSTACK_VERSION=v25.02 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 dd86a9b2e880d632386cbcd83d3c9a8b2b74e1e0 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 26 Feb 2025 16:03:45 +0000 Subject: [PATCH 137/161] 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 138/161] 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 139/161] 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: From 5eb7a6ccbd402954f8640cdff0c7083ab14ccbad Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sun, 16 Mar 2025 14:38:18 +0000 Subject: [PATCH 140/161] feat: update Dockerfile to use Bookstack v25.02.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 573b7961..8ca0ba91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v25.02 +ENV BOOKSTACK_VERSION=v25.02.1 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 bdd0933ea37ab41bcbd35825da179b1c3530e5c0 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sun, 16 Mar 2025 14:40:25 +0000 Subject: [PATCH 141/161] doc: update documentation to reference 25.2.1 --- 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 243c5612..52bab784 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_25.2.0 \ - solidnerd/bookstack:25.2.0 + --name bookstack_25.2.1 \ + solidnerd/bookstack:25.2.1 ``` ### 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_25.2.0" \ - solidnerd/bookstack:25.2.0 + --name="bookstack_25.2.1" \ + solidnerd/bookstack:25.2.1 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index baa90a68..5870c667 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -25.2.0 +25.2.1 diff --git a/docker-compose.yml b/docker-compose.yml index 1b44083b..e733bd0b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:25.2.0 + image: solidnerd/bookstack:25.2.1 depends_on: - mysql environment: From 79170a64bb36ee5d59781f7da87a5079d585a007 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Mar 2025 05:42:43 +0000 Subject: [PATCH 142/161] chore(deps): update metcalfc/changelog-generator action to v4.5.0 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7448e64..498a3b92 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -140,7 +140,7 @@ jobs: - name: Generate changelog id: changelog - uses: metcalfc/changelog-generator@v4.3.1 + uses: metcalfc/changelog-generator@v4.5.0 with: myToken: ${{ secrets.GITHUB_TOKEN }} From 2301ef9f84db10e6079394b3f49d2a0e937a5055 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 13:57:45 +0000 Subject: [PATCH 143/161] chore(deps): update php docker tag to v8.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ca0ba91..96e761a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN set -x; \ && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \ && rm bookstack.tar.gz -FROM php:8.3-apache-bookworm AS final +FROM php:8.4-apache-bookworm AS final RUN set -x; \ apt-get update \ && apt-get install -y --no-install-recommends \ From c7ca13922027bab24f8e370f8b7d1c86d6f7415e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 13:58:10 +0000 Subject: [PATCH 144/161] chore(deps): update mysql docker tag to v8.4 --- docker-compose.test.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 12b773a9..7d19a4a9 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -6,7 +6,7 @@ services: depends_on: - bookstack mysql: - image: mysql:8.3 + image: mysql:8.4 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack diff --git a/docker-compose.yml b/docker-compose.yml index e733bd0b..e3ef44a7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mysql: - image: mysql:8.3 + image: mysql:8.4 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack From 5e5aaad148ca2c4a75877e6e8d4ca2d3a6d7ce4b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 25 Mar 2025 14:03:38 +0000 Subject: [PATCH 145/161] chore(deps): update mysql docker tag to v9 --- docker-compose.test.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 7d19a4a9..7caf048f 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -6,7 +6,7 @@ services: depends_on: - bookstack mysql: - image: mysql:8.4 + image: mysql:9.2 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack diff --git a/docker-compose.yml b/docker-compose.yml index e3ef44a7..c31b6562 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mysql: - image: mysql:8.4 + image: mysql:9.2 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack From 0ed8683dd6721497a5e1ab4c5fae4b4758136fec Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 25 Mar 2025 14:07:58 +0000 Subject: [PATCH 146/161] docs: update MySQL version in non-compose set-up docs --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 52bab784..bf8daeb2 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ Networking changed in Docker v1.9, so you need to do one of the following steps. -e MYSQL_USER=bookstack \ -e MYSQL_PASSWORD=secret \ --name bookstack_db \ - mysql:5.7.21 + mysql:9.2.0 ``` 2. BookStack Container: @@ -91,7 +91,7 @@ Networking changed in Docker v1.9, so you need to do one of the following steps. -e MYSQL_USER=bookstack \ -e MYSQL_PASSWORD=secret \ --name="bookstack_db" \ - mysql:5.7.21 + mysql:9.2.0 ``` 3. Run BookStack Container From 83777b0ba3118d55e30e143be8a68493266cdef3 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 25 Mar 2025 14:14:35 +0000 Subject: [PATCH 147/161] docs: add APP_KEY to docker run command --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bf8daeb2..a40faea5 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ Networking changed in Docker v1.9, so you need to do one of the following steps. -e DB_USERNAME=bookstack \ -e DB_PASSWORD=secret \ -e APP_URL=http://example.com \ + -e APP_KEY=SomeRandomStringWith32Characters \ -p 8080:8080 \ --name="bookstack_25.2.1" \ solidnerd/bookstack:25.2.1 From f56d2ede995883534601df5bed90a6fec2090a20 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 25 Mar 2025 14:15:14 +0000 Subject: [PATCH 148/161] docs: remove instructions for Docker < 1.9 Docker 1.9 has been out of support for some time now, and shouldn't be used. Removal of the documentation for use of this version should hopefully avoid confusion. --- README.md | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/README.md b/README.md index a40faea5..8e283223 100644 --- a/README.md +++ b/README.md @@ -48,32 +48,6 @@ If you have any issues feel free to create an [issue on GitHub](https://github.c Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDAP_USER_FILTER"="(&(uid=\${user}))"` -Networking changed in Docker v1.9, so you need to do one of the following steps. - -### Docker < v1.9 - -1. MySQL Container: - - ```bash - docker run -d \ - -p 3306:3306 \ - -e MYSQL_ROOT_PASSWORD=secret \ - -e MYSQL_DATABASE=bookstack \ - -e MYSQL_USER=bookstack \ - -e MYSQL_PASSWORD=secret \ - --name bookstack_db \ - mysql:9.2.0 - ``` - -2. BookStack Container: - - ```bash - docker run -d --link bookstack_db_:mysql \ - -p 8080:8080 \ - --name bookstack_25.2.1 \ - solidnerd/bookstack:25.2.1 - ``` - ### Docker 1.9+ 1. Create a shared network: From 4069ae377f4fc212e28304c00bed86c97c31d684 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 25 Mar 2025 14:23:47 +0000 Subject: [PATCH 149/161] docs: remove outdated guidance on .env in non-compose instructions --- README.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 8e283223..a2405689 100644 --- a/README.md +++ b/README.md @@ -98,19 +98,15 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA ### Volumes -To access your `.env` file and important bookstack folders on your host system -change `` in the following line to your host directory and add it then to -your run command: +To access your important bookstack folders on your host system change `` +in the following line to your host directory and add it then to your run +command: ```bash ---mount type=bind,source=/.env,target=/var/www/bookstack/.env \ -v :/var/www/bookstack/public/uploads \ -v :/var/www/bookstack/storage/uploads ``` -In case of a windows host machine the .env file has to be already created in the -host directory otherwise a folder named .env will be created. - After these steps you can visit [http://localhost:8080](http://localhost:8080). You can login with username `admin@admin.com` and password `password`. From 14475c8b280cea1cab24171404f1fc7c551d68ee Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 25 Mar 2025 14:31:55 +0000 Subject: [PATCH 150/161] feat: change default APP_URL value Running a freshly-clone repository fails as the Bookstack container redirects to `example.com`, which isn't hosting a Bookstack instance. Updating the `APP_URL` to be the value set by default and referred to in the documention will prevent this. --- README.md | 6 +++--- docker-compose.yml | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index a2405689..eedfc419 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA -e DB_DATABASE=bookstack \ -e DB_USERNAME=bookstack \ -e DB_PASSWORD=secret \ - -e APP_URL=http://example.com \ + -e APP_URL=http://localhost:8080 \ -e APP_KEY=SomeRandomStringWith32Characters \ -p 8080:8080 \ --name="bookstack_25.2.1" \ @@ -84,9 +84,9 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA ``` The APP_URL parameter should be the base URL for your BookStack instance without - a trailing slash. For example: + a trailing slash, but including any port numbers. For example: - `APP_URL=http://example.com` + `APP_URL=http://example.com` or `APP_URL=http://localhost:8080`. The following environment variables are required for Bookstack to start: - `APP_KEY` diff --git a/docker-compose.yml b/docker-compose.yml index c31b6562..d204c03b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,8 +19,12 @@ services: - DB_DATABASE=bookstack - DB_USERNAME=bookstack - DB_PASSWORD=secret - #set the APP_ to the URL of bookstack without without a trailing slash APP_URL=https://example.com - - APP_URL=http://example.com + # Set the APP_ to the URL of bookstack without without a trailing slash, + # but including any port numbers. For example, one of: + # APP_URL=https://example.com + # APP_URL=http://localhost:8080 + # APP_URL=https://wiki.example.com:8443 + - APP_URL=http://localhost:8080 # APP_KEY is used for encryption where needed, so needs to be persisted to # preserve decryption abilities. # Can run `php artisan key:generate` to generate a key From 8f79725cf4d52e02626def1a1d92c1cca328df32 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Wed, 2 Apr 2025 18:36:11 +0100 Subject: [PATCH 151/161] feat: update Dockerfile to use Bookstack v25.02.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 96e761a8..3d940212 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v25.02.1 +ENV BOOKSTACK_VERSION=v25.02.2 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 4b1550814d7f070cb46b777951b737f2cf05cce1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 2 Apr 2025 21:28:37 +0000 Subject: [PATCH 152/161] chore(deps): update solidnerd/bookstack docker tag to v25.2.2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d204c03b..bfb3ad29 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:25.2.1 + image: solidnerd/bookstack:25.2.2 depends_on: - mysql environment: From cadb2914d220d5b19aa44b27514d478f2af170c2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 6 Apr 2025 10:26:47 +0000 Subject: [PATCH 153/161] chore(deps): update metcalfc/changelog-generator action to v4.6.2 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 498a3b92..c0f69e6b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -140,7 +140,7 @@ jobs: - name: Generate changelog id: changelog - uses: metcalfc/changelog-generator@v4.5.0 + uses: metcalfc/changelog-generator@v4.6.2 with: myToken: ${{ secrets.GITHUB_TOKEN }} From 7d8e34d9ec1d7c6114b015c4f8826dc2358bd5e2 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 6 May 2025 11:02:19 +0100 Subject: [PATCH 154/161] feat: update Dockerfile to use Bookstack v25.02.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3d940212..eae3c47f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v25.02.2 +ENV BOOKSTACK_VERSION=v25.02.3 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 5e7adebf53515b6932cd58bc86c4594114c1b74c Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Tue, 6 May 2025 11:05:07 +0100 Subject: [PATCH 155/161] doc: update documentation to reference 25.2.3 --- README.md | 4 ++-- VERSION | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index eedfc419..2424d11a 100644 --- a/README.md +++ b/README.md @@ -79,8 +79,8 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA -e APP_URL=http://localhost:8080 \ -e APP_KEY=SomeRandomStringWith32Characters \ -p 8080:8080 \ - --name="bookstack_25.2.1" \ - solidnerd/bookstack:25.2.1 + --name="bookstack_25.2.3" \ + solidnerd/bookstack:25.2.3 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 5870c667..9dc139e6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -25.2.1 +25.2.3 From aa18cab26b5c4776c0df50dae887098dfaf43d63 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 15:55:19 +0000 Subject: [PATCH 156/161] chore(deps): update solidnerd/bookstack docker tag to v25.2.3 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index bfb3ad29..99928ba2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:25.2.2 + image: solidnerd/bookstack:25.2.3 depends_on: - mysql environment: From 770ba7e33caab60603995e685d1b4c7a139b035b Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 8 May 2025 16:40:28 +0100 Subject: [PATCH 157/161] feat: update Dockerfile to use Bookstack v25.02.4 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eae3c47f..2bad4238 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v25.02.3 +ENV BOOKSTACK_VERSION=v25.02.4 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 b0bf3ce66b744d0538fa521375439b5fd413b03a Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Thu, 8 May 2025 16:41:53 +0100 Subject: [PATCH 158/161] doc: update documentation to reference 25.2.4 --- README.md | 4 ++-- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2424d11a..55d7fd26 100644 --- a/README.md +++ b/README.md @@ -79,8 +79,8 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA -e APP_URL=http://localhost:8080 \ -e APP_KEY=SomeRandomStringWith32Characters \ -p 8080:8080 \ - --name="bookstack_25.2.3" \ - solidnerd/bookstack:25.2.3 + --name="bookstack_25.2.4" \ + solidnerd/bookstack:25.2.4 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 9dc139e6..6d0540a8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -25.2.3 +25.2.4 diff --git a/docker-compose.yml b/docker-compose.yml index 99928ba2..21336660 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:25.2.3 + image: solidnerd/bookstack:25.2.4 depends_on: - mysql environment: From 30c18c19bbc2150dc5cbc9e1f6327276743f7e0e Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Sat, 17 May 2025 15:02:21 +0100 Subject: [PATCH 159/161] feat: update Dockerfile to use Bookstack v25.02.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2bad4238..6b3f48c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v25.02.4 +ENV BOOKSTACK_VERSION=v25.02.5 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 42c7952ca3fd41688a9e5d10409e56935cb673f7 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 2 Jun 2025 12:55:25 +0100 Subject: [PATCH 160/161] feat: update Dockerfile to use Bookstack v25.05 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b3f48c0..23fbde4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v25.02.5 +ENV BOOKSTACK_VERSION=v25.05 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 0821ea6e9f6a0f667fbbff11124db149569a7608 Mon Sep 17 00:00:00 2001 From: Rick Henry Date: Mon, 2 Jun 2025 12:59:37 +0100 Subject: [PATCH 161/161] doc: update documentation to reference 25.5.0 --- README.md | 4 ++-- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 55d7fd26..ce2473f8 100644 --- a/README.md +++ b/README.md @@ -79,8 +79,8 @@ Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDA -e APP_URL=http://localhost:8080 \ -e APP_KEY=SomeRandomStringWith32Characters \ -p 8080:8080 \ - --name="bookstack_25.2.4" \ - solidnerd/bookstack:25.2.4 + --name="bookstack_25.5.0" \ + solidnerd/bookstack:25.5.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without diff --git a/VERSION b/VERSION index 6d0540a8..722c6899 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -25.2.4 +25.5.0 diff --git a/docker-compose.yml b/docker-compose.yml index 21336660..ddae8637 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:25.2.4 + image: solidnerd/bookstack:25.5.0 depends_on: - mysql environment: