From 40fdb1058e0f62d2d56d7646ccd76efdcb92c8cb Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 28 May 2024 20:01:03 +0100 Subject: [PATCH 1/3] Rebase to 3.20 --- Dockerfile | 3 ++- Dockerfile.aarch64 | 3 ++- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 3 +-- readme-vars.yml | 1 + root/defaults/nginx/site-confs/default.conf.sample | 8 +++++--- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84e3782..2637378 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 # set version label ARG BUILD_DATE @@ -45,6 +45,7 @@ RUN \ /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b67840a..6a3089f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -45,6 +45,7 @@ RUN \ /app/www/ --strip-components=1 && \ echo "**** install composer dependencies ****" && \ composer install -d /app/www/ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/Jenkinsfile b/Jenkinsfile index 9967ae1..680c56c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { CI_SSL = 'false' CI_DELAY = '30' CI_DOCKERENV='TEST_RUN=1' - CI_AUTH = 'user:password' + CI_AUTH = '' CI_WEBPATH = '' } stages { diff --git a/README.md b/README.md index f692151..86c36af 100644 --- a/README.md +++ b/README.md @@ -337,6 +337,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.05.24:** - Rebase to Alpine 3.20. Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings. * **25.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3. * **31.10.23:** - Further sanitize sed replace. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 4a8571c..f893926 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: master -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'bookstackapp' @@ -26,5 +25,5 @@ repo_vars: - CI_SSL = 'false' - CI_DELAY = '30' - CI_DOCKERENV='TEST_RUN=1' - - CI_AUTH = 'user:password' + - CI_AUTH = '' - CI_WEBPATH = '' diff --git a/readme-vars.yml b/readme-vars.yml index 43b185b..e911fa5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -113,6 +113,7 @@ app_setup_block: | # changelog changelogs: + - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings."} - { date: "25.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "31.10.23:", desc: "Further sanitize sed replace." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 0644fbf..d8ef823 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,11 +1,13 @@ -## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/05/27 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server; listen [::]:80 default_server; - listen 443 ssl http2 default_server; - listen [::]:443 ssl http2 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; + + http2 on; server_name _; From 1078bd4dfb72b235fc13b692d3bda46d0ec5845c Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 28 May 2024 20:11:12 +0100 Subject: [PATCH 2/3] Update http2 wording --- readme-vars.yml | 2 +- root/defaults/nginx/site-confs/default.conf.sample | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index e911fa5..1d8da8d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -113,7 +113,7 @@ app_setup_block: | # changelog changelogs: - - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings."} + - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - { date: "25.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "31.10.23:", desc: "Further sanitize sed replace." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index d8ef823..cfcbda2 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -7,8 +7,6 @@ server { listen 443 ssl default_server; listen [::]:443 ssl default_server; - http2 on; - server_name _; include /config/nginx/ssl.conf; From 223740182f128aa5ddcf0d4380d05a77619fccff Mon Sep 17 00:00:00 2001 From: thespad Date: Wed, 29 May 2024 13:58:02 +0100 Subject: [PATCH 3/3] Use wildcard listener --- root/defaults/nginx/site-confs/default.conf.sample | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index cfcbda2..dd6693b 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,11 +1,8 @@ ## Version 2024/05/27 - Changelog: https://github.com/linuxserver/docker-bookstack/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { - listen 80 default_server; - listen [::]:80 default_server; - - listen 443 ssl default_server; - listen [::]:443 ssl default_server; + listen *:80 default_server; + listen *:443 ssl default_server; server_name _;