cphipps/radarr
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Rebase to 3.20

Browse Source
This commit is contained in:
thespad
2024-05-31 15:09:22 +01:00
parent 60c4853f78
commit f5119d3c66
7 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine:3.19 FROM ghcr.io/linuxserver/baseimage-alpine:3.20
# set version label # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -32,6 +32,7 @@ RUN \
/tmp/radarr.tar.gz -C \ /tmp/radarr.tar.gz -C \
/app/radarr/bin --strip-components=1 && \ /app/radarr/bin --strip-components=1 && \
echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/radarr/package_info && \ echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/radarr/package_info && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \
/app/radarr/bin/Radarr.Update \ /app/radarr/bin/Radarr.Update \

3
Dockerfile.aarch64
View File

@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1 # 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 # set version label
ARG BUILD_DATE ARG BUILD_DATE
@@ -31,6 +31,7 @@ RUN \
/tmp/radarr.tar.gz -C \ /tmp/radarr.tar.gz -C \
/app/radarr/bin --strip-components=1 && \ /app/radarr/bin --strip-components=1 && \
echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/radarr/package_info && \ echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/radarr/package_info && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \ echo "**** cleanup ****" && \
rm -rf \ rm -rf \
/app/radarr/bin/Radarr.Update \ /app/radarr/bin/Radarr.Update \

4
Jenkinsfile vendored
View File

@@ -30,8 +30,8 @@ pipeline {
CI_WEB='true' CI_WEB='true'
CI_PORT='7878' CI_PORT='7878'
CI_SSL='false' CI_SSL='false'
CI_DELAY='120' CI_DELAY='60'
CI_DOCKERENV='TZ=US/Pacific' CI_DOCKERENV=''
CI_AUTH='' CI_AUTH=''
CI_WEBPATH='/system/status' CI_WEBPATH='/system/status'
} }

1
README.md
View File

@@ -295,6 +295,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **31.05.24:** - Rebase Alpine 3.20.
* **20.03.24:** - Rebase to Alpine 3.19. * **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). * **06.06.23:** - Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
* **17.01.23:** - Rebase master branch to Alpine 3.17, migrate to s6v3. * **17.01.23:** - Rebase master branch to Alpine 3.17, migrate to s6v3.

5
jenkins-vars.yml
View File

@@ -6,7 +6,6 @@ custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/cha
release_type: stable release_type: stable
release_tag: latest release_tag: latest
ls_branch: master ls_branch: master
build_armhf: false
repo_vars: repo_vars:
- BUILD_VERSION_ARG = 'RADARR_RELEASE' - BUILD_VERSION_ARG = 'RADARR_RELEASE'
- LS_USER = 'linuxserver' - LS_USER = 'linuxserver'
@@ -21,8 +20,8 @@ repo_vars:
- CI_WEB='true' - CI_WEB='true'
- CI_PORT='7878' - CI_PORT='7878'
- CI_SSL='false' - CI_SSL='false'
- CI_DELAY='120' - CI_DELAY='60'
- CI_DOCKERENV='TZ=US/Pacific' - CI_DOCKERENV=''
- CI_AUTH='' - CI_AUTH=''
- CI_WEBPATH='/system/status' - CI_WEBPATH='/system/status'
sponsor_links: sponsor_links:

1
readme-vars.yml
View File

@@ -50,6 +50,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "31.05.24:", desc: "Rebase Alpine 3.20." }
- { date: "20.03.24:", desc: "Rebase to Alpine 3.19." } - { 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: "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: "17.01.23:", desc: "Rebase master branch to Alpine 3.17, migrate to s6v3." } - { date: "17.01.23:", desc: "Rebase master branch to Alpine 3.17, migrate to s6v3." }

4
root/etc/s6-overlay/s6-rc.d/svc-radarr/data/check
View File

@@ -1,6 +1,8 @@
#!/bin/bash #!/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 if [[ $(curl -sL "http://localhost:${PORT:-7878}/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
exit 0 exit 0