From 98e66eea1ba00b535374e649fc0b21eb3cca08e0 Mon Sep 17 00:00:00 2001 From: thespad Date: Sat, 25 May 2024 20:49:23 +0100 Subject: [PATCH 1/3] 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 5305f47..e9d0c10 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 @@ -32,6 +32,7 @@ RUN \ /tmp/radarr.tar.gz -C \ /app/radarr/bin --strip-components=1 && \ echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/radarr/package_info && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /app/radarr/bin/Radarr.Update \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7e723eb..ea40cc1 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 @@ -32,6 +32,7 @@ RUN \ /tmp/radarr.tar.gz -C \ /app/radarr/bin --strip-components=1 && \ echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/radarr/package_info && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /app/radarr/bin/Radarr.Update \ diff --git a/Jenkinsfile b/Jenkinsfile index d303cab..153293b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,8 +30,8 @@ pipeline { CI_WEB='true' CI_PORT='7878' CI_SSL='false' - CI_DELAY='120' - CI_DOCKERENV='TZ=Europe/London' + CI_DELAY='60' + CI_DOCKERENV='' CI_AUTH='' CI_WEBPATH='/system/status' } diff --git a/README.md b/README.md index 7636a9a..03b2f09 100644 --- a/README.md +++ b/README.md @@ -295,6 +295,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 67d5faa..c579f14 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,7 +7,6 @@ custom_version_command: curl -sL https://radarr.servarr.com/v1/update/nightly/ch release_type: prerelease release_tag: nightly ls_branch: nightly -build_armhf: false repo_vars: - BUILD_VERSION_ARG = 'RADARR_RELEASE' - LS_USER = 'linuxserver' @@ -22,8 +21,8 @@ repo_vars: - CI_WEB='true' - CI_PORT='7878' - CI_SSL='false' - - CI_DELAY='120' - - CI_DOCKERENV='TZ=Europe/London' + - CI_DELAY='60' + - CI_DOCKERENV='' - CI_AUTH='' - CI_WEBPATH='/system/status' sponsor_links: diff --git a/readme-vars.yml b/readme-vars.yml index 8de14b0..cc0ea8b 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -50,6 +50,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 86a3af38fd107754eec702b6ae35b21257ddb03a Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 26 May 2024 14:42:21 +0100 Subject: [PATCH 2/3] Don't try and read config.xml if it doesn't exist yet --- root/etc/s6-overlay/s6-rc.d/svc-radarr/data/check | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-radarr/data/check b/root/etc/s6-overlay/s6-rc.d/svc-radarr/data/check index 57b08c4..1832dc6 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-radarr/data/check +++ b/root/etc/s6-overlay/s6-rc.d/svc-radarr/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:-7878}/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then exit 0 From 9002b8b086b6d5996d286fc29429d321b09a1901 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 26 May 2024 14:52:38 +0100 Subject: [PATCH 3/3] Increase CI delay for slow arm tests --- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 153293b..0add030 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ pipeline { CI_WEB='true' CI_PORT='7878' CI_SSL='false' - CI_DELAY='60' + CI_DELAY='120' CI_DOCKERENV='' CI_AUTH='' CI_WEBPATH='/system/status' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index c579f14..94b11ce 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -21,7 +21,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='7878' - CI_SSL='false' - - CI_DELAY='60' + - CI_DELAY='120' - CI_DOCKERENV='' - CI_AUTH='' - CI_WEBPATH='/system/status'