diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 3e03438..35d7c01 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?runtime=netcore%26os=linux | jq -r '.[0].version') + EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linuxmusl | 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 d17b3ba..f898147 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:focal +FROM ghcr.io/linuxserver/baseimage-alpine:3.15 # set version label ARG BUILD_DATE @@ -8,7 +8,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" @@ -23,22 +22,20 @@ RUN \ 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" \ + RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \ | 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 \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=x64" && \ + tar xzf \ /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 -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/radarr/package_info && \ echo "**** cleanup ****" && \ rm -rf \ /app/radarr/bin/Radarr.Update \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + /tmp/* # copy local files COPY root/ / diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8e4a96a..554a0a5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -7,8 +7,6 @@ ARG RADARR_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="thelamer" -# environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" @@ -23,22 +21,20 @@ RUN \ 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" \ + RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \ | 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 \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm64" && \ + tar xzf \ /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 -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/radarr/package_info && \ echo "**** cleanup ****" && \ rm -rf \ /app/radarr/bin/Radarr.Update \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + /tmp/* # copy local files COPY root/ / diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 0e4081f..8a504d6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -8,7 +8,6 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" # environment settings -ARG DEBIAN_FRONTEND="noninteractive" ARG RADARR_BRANCH="master" ENV XDG_CONFIG_HOME="/config/xdg" @@ -23,22 +22,20 @@ RUN \ 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" \ + RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \ | 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 \ + "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm" && \ + tar xzf \ /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 && \ + echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/radarr/package_info && \ rm -rf \ /app/radarr/bin/Radarr.Update \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* + /tmp/* # copy local files COPY root/ / diff --git a/Jenkinsfile b/Jenkinsfile index e6de305..14fa949 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { DOCKERHUB_IMAGE = 'linuxserver/radarr' DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr' PR_DOCKERHUB_IMAGE = 'lspipepr/radarr' - DIST_IMAGE = 'ubuntu' + DIST_IMAGE = 'alpine' MULTIARCH='true' CI='true' CI_WEB='true' @@ -104,7 +104,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version' ''', + script: ''' curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 3eb0054..1960050 100644 --- a/README.md +++ b/README.md @@ -245,6 +245,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **06.06.22:** - Rebase master branch to Alpine 3.15. * **20.02.22:** - Rebase develop branch to Alpine. * **04.02.22:** - Rebase nightly branch to Alpine and deprecate nightly-alpine branch. * **27.12.21:** - Add nightly-alpine branch. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 5285c61..9faf313 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -2,7 +2,7 @@ # jenkins variables project_name: docker-radarr external_type: na -custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linux | jq -r '.[0].version' +custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version' release_type: stable release_tag: latest ls_branch: master @@ -14,7 +14,7 @@ repo_vars: - DOCKERHUB_IMAGE = 'linuxserver/radarr' - DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr' - PR_DOCKERHUB_IMAGE = 'lspipepr/radarr' - - DIST_IMAGE = 'ubuntu' + - DIST_IMAGE = 'alpine' - MULTIARCH='true' - CI='true' - CI_WEB='true' diff --git a/readme-vars.yml b/readme-vars.yml index d4ad4c2..8caaca6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -56,6 +56,7 @@ app_setup_block: | # changelog changelogs: + - { date: "06.06.22:", desc: "Rebase master branch to Alpine 3.15." } - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." } - { date: "04.02.22:", desc: "Rebase nightly branch to Alpine and deprecate nightly-alpine branch." } - { date: "27.12.21:", desc: "Add nightly-alpine branch." }