Merge pull request #213 from linuxserver/3.20

Rebase to 3.20

Author: thespad

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/* \

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/* \

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 {

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.

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 = ''

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 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." }

root/defaults/nginx/site-confs/default.conf.sample

@@ -1,11 +1,8 @@
-## 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 *:80 default_server;
+    listen *:443 ssl default_server;
 
     server_name _;