From a5b923f513df411d210f93a978f82dffdcb5a235 Mon Sep 17 00:00:00 2001
From: thespad <spad@linuxserver.io>
Date: Mon, 26 Aug 2024 20:45:09 +0100
Subject: [PATCH] Rebase to 3.20

---
 Dockerfile         | 11 ++++++-----
 Dockerfile.aarch64 | 13 +++++++------
 Jenkinsfile        |  4 ++--
 README.md          |  1 +
 jenkins-vars.yml   |  4 ++--
 readme-vars.yml    |  4 +---
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3f70e2a..81e5b8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.18
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -10,10 +10,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base \
-    npm && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     findutils \
@@ -21,6 +17,10 @@ RUN \
     nodejs \
     python3 \
     sudo && \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    build-base \
+    npm && \
   echo "**** install Pylon ****" && \
   mkdir -p \
     /app/pylon && \
@@ -39,6 +39,7 @@ RUN \
     /app/pylon/.sessions && \
   echo "**** install node modules ****" && \
   npm install --prefix /app/pylon && \
+  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 5a7d1f9..645c2cc 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE
@@ -10,10 +10,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 RUN \
-  echo "**** install build packages ****" && \
-  apk add --no-cache --virtual=build-dependencies \
-    build-base \
-    npm && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
     findutils \
@@ -21,7 +17,11 @@ RUN \
     nodejs \
     python3 \
     sudo && \
-  echo "**** install Pylon ****" && \
+  echo "**** install build packages ****" && \
+  apk add --no-cache --virtual=build-dependencies \
+    build-base \
+    npm && \
+   echo "**** install Pylon ****" && \
   mkdir -p \
     /app/pylon && \
   if [ -z ${PYLON_RELEASE+x} ]; then \
@@ -39,6 +39,7 @@ RUN \
     /app/pylon/.sessions && \
   echo "**** install node modules ****" && \
   npm install --prefix /app/pylon && \
+  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 ff79669..3daa7b3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,8 +36,8 @@ pipeline {
     CI_PORT='3131'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
     CI_WEBPATH=''
   }
   stages {
diff --git a/README.md b/README.md
index 133ba64..56e760f 100644
--- a/README.md
+++ b/README.md
@@ -280,6 +280,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **26.08.24:** - Rebase to Alpine 3.20
 * **12.07.23:** - Rebase to Alpine 3.18
 * **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
 * **13.02.23:** - Rebase to Alpine 3.17, migrate to s6v3.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index f9f8f9c..bf17e23 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -24,6 +24,6 @@ repo_vars:
   - CI_PORT='3131'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
diff --git a/readme-vars.yml b/readme-vars.yml
index f2e052d..e30c119 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -16,9 +16,6 @@ param_container_name: "{{ project_name }}"
 param_usage_include_ports: true
 param_ports:
   - {external_port: "3131", internal_port: "3131", port_desc: "The port for the Pylon web interface"}
-param_usage_include_env: true
-param_env_vars:
-  - {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
 # optional params
 opt_param_usage_include_vols: true
 opt_param_volumes:
@@ -34,6 +31,7 @@ app_setup_block: |
   Access the webui at http://your-ip:3131, more information [here](https://github.com/pylonide/pylon).
 # changelog
 changelogs:
+  - {date: "26.08.24:", desc: "Rebase to Alpine 3.20"}
   - {date: "12.07.23:", desc: "Rebase to Alpine 3.18"}
   - {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
   - {date: "13.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3."}