diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 96380ce..3e03438 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,7 +18,7 @@ jobs: fi echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER\". ****" echo "**** Retrieving external version ****" - EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/master/changes?os=linux | jq -r '.[0].version') + EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version') if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "**** Can't retrieve external version, exiting ****" FAILURE_REASON="Can't retrieve external version for radarr branch master" diff --git a/Dockerfile b/Dockerfile index 637d9b9..d17b3ba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,32 +13,32 @@ ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ - jq \ - libicu66 \ - libmediainfo0v5 \ - sqlite3 && \ - echo "**** install radarr ****" && \ - mkdir -p /app/radarr/bin && \ - if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ - | jq -r '.[0].version'); \ - fi && \ - curl -o \ - /tmp/radarr.tar.gz -L \ - "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \ - tar ixzf \ - /tmp/radarr.tar.gz -C \ - /app/radarr/bin --strip-components=1 && \ - echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ - echo "**** cleanup ****" && \ - rm -rf \ - /app/radarr/bin/Radarr.Update \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install --no-install-recommends -y \ + jq \ + libicu66 \ + libmediainfo0v5 \ + sqlite3 && \ + echo "**** install radarr ****" && \ + mkdir -p /app/radarr/bin && \ + if [ -z ${RADARR_RELEASE+x} ]; then \ + RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linux" \ + | jq -r '.[0].version'); \ + fi && \ + curl -o \ + /tmp/radarr.tar.gz -L \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \ + tar ixzf \ + /tmp/radarr.tar.gz -C \ + /app/radarr/bin --strip-components=1 && \ + echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ + echo "**** cleanup ****" && \ + rm -rf \ + /app/radarr/bin/Radarr.Update \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 503224e..8e4a96a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -13,32 +13,32 @@ ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ - jq \ - libicu66 \ - libmediainfo0v5 \ - sqlite3 && \ - echo "**** install radarr ****" && \ - mkdir -p /app/radarr/bin && \ - if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ - | jq -r '.[0].version'); \ - fi && \ - curl -o \ - /tmp/radarr.tar.gz -L \ - "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \ - tar ixzf \ - /tmp/radarr.tar.gz -C \ - /app/radarr/bin --strip-components=1 && \ - echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ - echo "**** cleanup ****" && \ - rm -rf \ - /app/radarr/bin/Radarr.Update \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install --no-install-recommends -y \ + jq \ + libicu66 \ + libmediainfo0v5 \ + sqlite3 && \ + echo "**** install radarr ****" && \ + mkdir -p /app/radarr/bin && \ + if [ -z ${RADARR_RELEASE+x} ]; then \ + RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linux" \ + | jq -r '.[0].version'); \ + fi && \ + curl -o \ + /tmp/radarr.tar.gz -L \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \ + tar ixzf \ + /tmp/radarr.tar.gz -C \ + /app/radarr/bin --strip-components=1 && \ + echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ + echo "**** cleanup ****" && \ + rm -rf \ + /app/radarr/bin/Radarr.Update \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 92ec8ab..0e4081f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -13,32 +13,32 @@ ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install packages ****" && \ - apt-get update && \ - apt-get install --no-install-recommends -y \ - jq \ - libicu66 \ - libmediainfo0v5 \ - sqlite3 && \ - echo "**** install radarr ****" && \ - mkdir -p /app/radarr/bin && \ - if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?os=linux" \ - | jq -r '.[0].version'); \ - fi && \ - curl -o \ - /tmp/radarr.tar.gz -L \ - "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \ - tar ixzf \ - /tmp/radarr.tar.gz -C \ - /app/radarr/bin --strip-components=1 && \ - echo "**** cleanup ****" && \ - echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ - rm -rf \ - /app/radarr/bin/Radarr.Update \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + echo "**** install packages ****" && \ + apt-get update && \ + apt-get install --no-install-recommends -y \ + jq \ + libicu66 \ + libmediainfo0v5 \ + sqlite3 && \ + echo "**** install radarr ****" && \ + mkdir -p /app/radarr/bin && \ + if [ -z ${RADARR_RELEASE+x} ]; then \ + RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linux" \ + | jq -r '.[0].version'); \ + fi && \ + curl -o \ + /tmp/radarr.tar.gz -L \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \ + tar ixzf \ + /tmp/radarr.tar.gz -C \ + /app/radarr/bin --strip-components=1 && \ + echo "**** cleanup ****" && \ + echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \ + rm -rf \ + /app/radarr/bin/Radarr.Update \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* # copy local files COPY root/ / diff --git a/Jenkinsfile b/Jenkinsfile index 3863ae6..565002a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -103,7 +103,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sL https://radarr.servarr.com/v1/update/master/changes?os=linux | jq -r '.[0].version' ''', + script: ''' curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 05180db..e131290 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ We have set `/movies` and `/downloads` as ***optional paths***, this is because Use the optional paths if you dont understand, or dont want hardlinks/atomic moves. -The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/Docker_Guide#Consistent_and_well_planned_paths) on how to get started with this. +The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths) on how to get started with this. ## Usage diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e67b018..5285c61 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -1,9 +1,8 @@ --- - # jenkins variables project_name: docker-radarr external_type: na -custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/changes?os=linux | jq -r '.[0].version' +custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version' release_type: stable release_tag: latest ls_branch: master diff --git a/readme-vars.yml b/readme-vars.yml index 88e41e1..6e64fa6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -52,7 +52,7 @@ app_setup_block: | Use the optional paths if you dont understand, or dont want hardlinks/atomic moves. - The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/Docker_Guide#Consistent_and_well_planned_paths) on how to get started with this. + The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths) on how to get started with this. # changelog changelogs: diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 4a919c2..aa3208d 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -2,4 +2,4 @@ # permissions chown -R abc:abc \ - /config + /config diff --git a/root/etc/services.d/radarr/run b/root/etc/services.d/radarr/run index a2a313a..920cb4b 100644 --- a/root/etc/services.d/radarr/run +++ b/root/etc/services.d/radarr/run @@ -8,5 +8,5 @@ fi cd /app/radarr/bin || exit exec \ - s6-setuidgid abc /app/radarr/bin/Radarr \ - -nobrowser -data=/config \ No newline at end of file + s6-setuidgid abc /app/radarr/bin/Radarr \ + -nobrowser -data=/config \ No newline at end of file