From 8a023309c059e6869a7de628801fae1ad22aed6c Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Sun, 26 May 2024 17:51:35 +0100
Subject: [PATCH] Rebase to 3.20

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

diff --git a/Dockerfile b/Dockerfile
index be39bc5..1f4d48d 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
@@ -45,6 +45,7 @@ RUN \
   rm -rf /app/overseerr/config && \
   ln -s /config /app/overseerr/config && \
   touch /config/DOCKER && \
+  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 4fb0a73..bbab4f8 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
@@ -45,6 +45,7 @@ RUN \
   rm -rf /app/overseerr/config && \
   ln -s /config /app/overseerr/config && \
   touch /config/DOCKER && \
+  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 1c6b1e9..bd2c7af 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,8 +31,8 @@ pipeline {
     CI_PORT='5055'
     CI_SSL='false'
     CI_DELAY='300'
-    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 df674ea..0ce5c03 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.05.24:** - Rebase to Alpine 3.20.
 * **23.12.23:** - Rebase to Alpine 3.19.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **18.12.22:** - Rebase develop to 3.17.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index c0b9e1f..a77fa90 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -7,7 +7,6 @@ custom_version_command: "curl -sX GET https://api.github.com/repos/sct/overseerr
 release_type: prerelease
 release_tag: develop
 ls_branch: develop
-build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'OVERSEERR_VERSION'
   - LS_USER = 'linuxserver'
@@ -23,8 +22,8 @@ repo_vars:
   - CI_PORT='5055'
   - CI_SSL='false'
   - CI_DELAY='300'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
   - CI_WEBPATH=''
 sponsor_links:
   - { name: "Overseerr Github Sponsors", url: "https://github.com/sponsors/sct" }
diff --git a/readme-vars.yml b/readme-vars.yml
index ac2b58e..9205b16 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -46,6 +46,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "26.05.24:", desc: "Rebase to Alpine 3.20."}
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19."}
   - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
   - { date: "18.12.22:", desc: "Rebase develop to 3.17." }