From c48eef1549027c12e0a63d4daac9d80db1204c35 Mon Sep 17 00:00:00 2001
From: thespad <git@spad.co.uk>
Date: Fri, 31 May 2024 15:09:15 +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 +
 root/etc/s6-overlay/s6-rc.d/svc-prowlarr/data/check | 4 +++-
 7 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 03f794f..4a432b5 100755
--- 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
@@ -32,6 +32,7 @@ RUN \
     /tmp/prowlarr.tar.gz -C \
     /app/prowlarr/bin --strip-components=1 && \
   echo -e "UpdateMethod=docker\nBranch=${PROWLARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/prowlarr/package_info && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/prowlarr/bin/Prowlarr.Update \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index cfb8f02..0a566e3 100755
--- 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
@@ -32,6 +32,7 @@ RUN \
     /tmp/prowlarr.tar.gz -C \
     /app/prowlarr/bin --strip-components=1 && \
   echo -e "UpdateMethod=docker\nBranch=${PROWLARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/prowlarr/package_info && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/prowlarr/bin/Prowlarr.Update \
diff --git a/Jenkinsfile b/Jenkinsfile
index fbf3e31..e98d77f 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -30,8 +30,8 @@ pipeline {
     CI_WEB='true'
     CI_PORT='9696'
     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 739d0f7..3e6476a 100644
--- a/README.md
+++ b/README.md
@@ -283,6 +283,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **31.05.24:** - Rebase Alpine 3.20.
 * **20.03.24:** - Rebase to Alpine 3.19.
 * **06.06.23:** - Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
 * **03.01.23:** - Publish stable release.
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 4a80117..0decbf3 100755
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,7 +6,6 @@ custom_version_command: curl -sL "https://prowlarr.servarr.com/v1/update/master/
 release_type: stable
 release_tag: latest
 ls_branch: main
-build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'PROWLARR_RELEASE'
   - LS_USER = 'linuxserver'
@@ -21,8 +20,8 @@ repo_vars:
   - CI_WEB='true'
   - CI_PORT='9696'
   - 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 7c2a67d..b20faf9 100755
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -39,6 +39,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "31.05.24:", desc: "Rebase Alpine 3.20." }
   - { date: "20.03.24:", desc: "Rebase to Alpine 3.19." }
   - { date: "06.06.23:", desc: "Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
   - { date: "03.01.23:", desc: "Publish stable release." }
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/data/check b/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/data/check
index 78a30ed..56dbc43 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/data/check
+++ b/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/data/check
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
+if [[ -f /config/config.xml ]]; then
+    PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
+fi
 
 if [[ $(curl -sL "http://localhost:${PORT:-9696}/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
     exit 0