From 2f369fb0c48818006cfb8c8a513d9b6c04cf240f Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Fri, 31 May 2024 17:38:26 +0100
Subject: [PATCH] Rebase to 3.20

---
 Dockerfile         | 6 ++++--
 Dockerfile.aarch64 | 6 ++++--
 Jenkinsfile        | 6 +++---
 README.md          | 1 +
 jenkins-vars.yml   | 7 +++----
 readme-vars.yml    | 4 +---
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 06619a5..71f6feb 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
@@ -35,7 +35,7 @@ RUN \
     poppler-utils \
     re2c && \
   echo "**** modify php-fpm process limits ****" && \
-  sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \  
+  sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \
   echo "**** download piwigo ****" && \
   if [ -z ${PIWIGO_RELEASE+x} ]; then \
     PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
@@ -47,6 +47,7 @@ RUN \
     "https://piwigo.org/download/dlcounter.php?code=${PIWIGO_RELEASE}" && \
   unzip -q /tmp/piwigo.zip -d /tmp && \
   mv /tmp/piwigo/* /app/www/public && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
@@ -56,4 +57,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 80 443
+
 VOLUME /config /gallery
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 192e195..4abd3fb 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
@@ -35,7 +35,7 @@ RUN \
     poppler-utils \
     re2c && \
   echo "**** modify php-fpm process limits ****" && \
-  sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \  
+  sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \
   echo "**** download piwigo ****" && \
   if [ -z ${PIWIGO_RELEASE+x} ]; then \
     PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \
@@ -47,6 +47,7 @@ RUN \
     "https://piwigo.org/download/dlcounter.php?code=${PIWIGO_RELEASE}" && \
   unzip -q /tmp/piwigo.zip -d /tmp && \
   mv /tmp/piwigo/* /app/www/public && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/*
@@ -56,4 +57,5 @@ COPY root/ /
 
 # ports and volumes
 EXPOSE 80 443
+
 VOLUME /config /gallery
diff --git a/Jenkinsfile b/Jenkinsfile
index ccaac2e..21a0868 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,9 +33,9 @@ pipeline {
     CI_WEB='true'
     CI_PORT='80'
     CI_SSL='false'
-    CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DELAY='60'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {
diff --git a/README.md b/README.md
index 6b409dc..2e1cd6a 100644
--- a/README.md
+++ b/README.md
@@ -278,6 +278,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **07.04.24:** - Increase php workers to fix Android uploading in bulk
 * **02.03.24:** - Fix HEIC file format support.
 * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index ce0a098..364cfba 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 = 'Piwigo'
@@ -24,7 +23,7 @@ repo_vars:
   - CI_WEB='true'
   - CI_PORT='80'
   - CI_SSL='false'
-  - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DELAY='60'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
index ef9a1a2..307abbc 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -15,9 +15,6 @@ available_architectures:
 # container parameters
 common_param_env_vars_enabled: true #PGID, PUID, etc, you can set it to 'optional'
 param_container_name: "{{ project_name }}"
-param_usage_include_env: true
-param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
 param_usage_include_vols: true
 param_volumes:
   - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
@@ -37,6 +34,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - { date: "07.04.24:", desc: "Increase php workers to fix Android uploading in bulk"}
   - { date: "02.03.24:", desc: "Fix HEIC file format support."}
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}