From d0acb677a159371af541485d91eb5cfac43c8e0f Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Sat, 25 May 2024 20:42:47 +0100
Subject: [PATCH 1/2] Rebase to 3.20

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

diff --git a/Dockerfile b/Dockerfile
index b9a9d547..5ac24b59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:3.20
 
 # set version label
 ARG BUILD_DATE
@@ -33,6 +33,7 @@ RUN \
     /tmp/lidarr.tar.gz -C \
     /app/lidarr/bin --strip-components=1 && \
   echo -e "UpdateMethod=docker\nBranch=${LIDARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/lidarr/package_info && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/lidarr/bin/Lidarr.Update \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 26b95b3a..f3719d12 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -33,6 +33,7 @@ RUN \
     /tmp/lidarr.tar.gz -C \
     /app/lidarr/bin --strip-components=1 && \
   echo -e "UpdateMethod=docker\nBranch=${LIDARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/lidarr/package_info && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/lidarr/bin/Lidarr.Update \
diff --git a/Jenkinsfile b/Jenkinsfile
index ab2af298..b00111ec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,8 +30,8 @@ pipeline {
     CI_WEB='true'
     CI_PORT='8686'
     CI_SSL='false'
-    CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DELAY='60'
+    CI_DOCKERENV=''
     CI_AUTH=''
     CI_WEBPATH='/system/status'
   }
diff --git a/README.md b/README.md
index 8649a8a7..42348889 100644
--- a/README.md
+++ b/README.md
@@ -299,6 +299,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **25.05.24:** - Rebase to Alpine 3.20.
 * **20.03.24:** - Rebase to Alpine 3.19.
 * **06.06.23:** - Rebase nightly to Alpine 3.18.
 * **19.12.22:** - Rebase nightly to Alpine 3.17.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 5bcde52d..96be5a71 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,7 +6,6 @@ custom_version_command: curl -sL "https://lidarr.servarr.com/v1/update/nightly/c
 release_type: prerelease
 release_tag: nightly
 ls_branch: nightly
-build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'LIDARR_RELEASE'
   - LS_USER = 'linuxserver'
@@ -21,8 +20,8 @@ repo_vars:
   - CI_WEB='true'
   - CI_PORT='8686'
   - CI_SSL='false'
-  - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DELAY='60'
+  - CI_DOCKERENV=''
   - CI_AUTH=''
   - CI_WEBPATH='/system/status'
 sponsor_links:
diff --git a/readme-vars.yml b/readme-vars.yml
index 7a934f59..e79fe890 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -53,6 +53,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "25.05.24:", desc: "Rebase to Alpine 3.20." }
   - { date: "20.03.24:", desc: "Rebase to Alpine 3.19." }
   - { date: "06.06.23:", desc: "Rebase nightly to Alpine 3.18." }
   - { date: "19.12.22:", desc: "Rebase nightly to Alpine 3.17." }

From 2b04c423ced952ebd3856e304d5a65f72a766e40 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Sat, 25 May 2024 20:43:37 +0100
Subject: [PATCH 2/2] Changing baseimage might be helpful

---
 Dockerfile.aarch64 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index f3719d12..f60512d1 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
 
 # set version label
 ARG BUILD_DATE