From a51ed4c241b51313dce9415f578cadde5db388d6 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Tue, 28 May 2024 20:11:29 +0100
Subject: [PATCH 1/2] Rebase to 3.20

---
 Dockerfile         | 3 ++-
 Dockerfile.aarch64 | 3 ++-
 Jenkinsfile        | 6 +++---
 README.md          | 1 +
 jenkins-vars.yml   | 6 +++---
 readme-vars.yml    | 1 +
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b2ef92e..da01ddd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
 
 ARG BUILD_DATE
 ARG VERSION
@@ -82,6 +82,7 @@ RUN \
   composer install \
     --no-dev \
     --no-interaction && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index f796a99..c887036 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
 
 ARG BUILD_DATE
 ARG VERSION
@@ -83,6 +83,7 @@ RUN \
   composer install \
     --no-dev \
     --no-interaction && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
diff --git a/Jenkinsfile b/Jenkinsfile
index 6b8b5b2..32eaa39 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,9 +33,9 @@ pipeline {
     CI_WEB='false'
     CI_PORT='80'
     CI_SSL='false'
-    CI_DELAY='120'
-    CI_DOCKERENV='TZ=Europe/London'
-    CI_AUTH='user:password'
+    CI_DELAY='60'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {
diff --git a/README.md b/README.md
index e486898..c6e54d5 100644
--- a/README.md
+++ b/README.md
@@ -302,5 +302,6 @@ 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.
 * **02.05.24:** - Rebase to Alpine 3.19 and PHP 8.3.
 * **17.01.24:** - Initial Release.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 203519a..dea55c4 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -23,7 +23,7 @@ repo_vars:
   - CI_WEB='false'
   - CI_PORT='80'
   - CI_SSL='false'
-  - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=Europe/London'
-  - CI_AUTH='user:password'
+  - CI_DELAY='60'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
index 92ce9ac..278e065 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -48,5 +48,6 @@ 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: "02.05.24:", desc: "Rebase to Alpine 3.19 and PHP 8.3." }
   - { date: "17.01.24:", desc: "Initial Release." }

From a5cdfa0b6a40c0cc59cf07e2bbdf7d19aba1fab8 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Wed, 29 May 2024 14:00:38 +0100
Subject: [PATCH 2/2] Add missing syntax

---
 Dockerfile         | 2 ++
 Dockerfile.aarch64 | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index da01ddd..a89efaa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
 
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c887036..18dc5d0 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1
+
 FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
 
 ARG BUILD_DATE