Rebase to 3.20

linuxserver · May 26, 2024 · f0df98b · f0df98b
1 parent 93973d9
commit f0df98b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -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
@@ -31,7 +31,7 @@ pipeline {
     CI_PORT='9696'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV=''
     CI_AUTH=''
     CI_WEBPATH='/system/status'
   }

diff --git a/README.md b/README.md
@@ -283,6 +283,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 develop to Alpine 3.18.
 * **19.12.22:** - Rebase develop branch to Alpine 3.17.

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -6,7 +6,6 @@ custom_version_command: curl -sL "https://prowlarr.servarr.com/v1/update/develop
 release_type: prerelease
 release_tag: develop
 ls_branch: develop
-build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'PROWLARR_RELEASE'
   - LS_USER = 'linuxserver'
@@ -22,7 +21,7 @@ repo_vars:
   - CI_PORT='9696'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV=''
   - CI_AUTH=''
   - CI_WEBPATH='/system/status'
 sponsor_links:

diff --git a/readme-vars.yml b/readme-vars.yml
@@ -38,6 +38,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 develop to Alpine 3.18." }
   - { date: "19.12.22:", desc: "Rebase develop branch to Alpine 3.17." }

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
@@ -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