Rebase to 3.20

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
@@ -49,10 +49,11 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
     -r requirements.txt && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
     mysqlclient && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

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
@@ -49,10 +49,11 @@ RUN \
   pip install -U --no-cache-dir \
     pip \
     wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
     -r requirements.txt && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
     mysqlclient && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \

Jenkinsfile

@@ -33,9 +33,9 @@ pipeline {
     CI_WEB='true'
     CI_PORT='8000'
     CI_SSL='false'
-    CI_DELAY='60'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DELAY='120'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH='/'
   }
   stages {

README.md

@@ -276,6 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **30.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
 * **05.07.23:** - Add standard HTTP/HTTPS listen ports 80 and 443, keeping 8000 for backwards compatibility.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.

jenkins-vars.yml

@@ -6,7 +6,6 @@ external_type: github_stable
 release_type: stable
 release_tag: latest
 ls_branch: main
-build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'babybuddy'
@@ -24,9 +23,9 @@ repo_vars:
   - CI_WEB='true'
   - CI_PORT='8000'
   - CI_SSL='false'
-  - CI_DELAY='60'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DELAY='120'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH='/'
 sponsor_links:
   - { name: "BabyBuddy", url: "https://github.com/sponsors/cdubz" }

readme-vars.yml

@@ -23,13 +23,8 @@ param_ports:
   - { external_port: "8000", internal_port: "8000", port_desc: "the port for the web ui" }
 param_usage_include_env: true
 param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London" }
   - { env_var: "CSRF_TRUSTED_ORIGINS", env_value: "http://127.0.0.1:8000,https://babybuddy.domain.com", desc: "Add any address you'd like to access babybuddy at (comma separated, no spaces)" }
 
-# optional container parameters
-opt_param_usage_include_env: false
-opt_param_env_vars:
-
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -39,6 +34,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "30.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
   - { date: "05.07.23:", desc: "Add standard HTTP/HTTPS listen ports 80 and 443, keeping 8000 for backwards compatibility." }
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }

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

@@ -1,11 +1,8 @@
-## Version 2023/07/05 - Changelog: https://github.com/linuxserver/docker-babybuddy/commits/main/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/06/30 - Changelog: https://github.com/linuxserver/docker-babybuddy/commits/main/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;
 
     listen 8000;
     listen [::]:8000;