Rebase to 3.20

linuxserver · May 28, 2024 · a51ed4c · a51ed4c
1 parent fb44a5a
commit a51ed4c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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." }