diff --git a/Dockerfile b/Dockerfile index ce8061c..912433a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/mono:LTS +FROM lsiobase/ubuntu:bionic # set version label ARG BUILD_DATE @@ -9,36 +9,37 @@ LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" +ARG RADARR_BRANCH="aphrodite" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install jq ****" && \ + echo "**** install packages ****" && \ apt-get update && \ - apt-get install -y \ - jq && \ + apt-get install --no-install-recommends -y \ + jq \ + libicu60 \ + libmediainfo0v5 && \ echo "**** install radarr ****" && \ + mkdir -p /opt/radarr && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL "https://radarr.aeonlucid.com/v1/update/aphrodite/changes?os=linux" \ + RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ fi && \ - RADARR_DURL=$(curl -sL "https://radarr.aeonlucid.com/v1/update/aphrodite/changes?os=linux" \ - | jq -r "first(.[] | select(.version == \"${RADARR_RELEASE}\")) | .url") && \ - mkdir -p \ - /opt/radarr && \ curl -o \ - /tmp/radar.tar.gz -L \ - "${RADARR_DURL}" && \ + /tmp/radarr.tar.gz -L \ + "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \ tar ixzf \ - /tmp/radar.tar.gz -C \ + /tmp/radarr.tar.gz -C \ /opt/radarr --strip-components=1 && \ - echo "**** clean up ****" && \ + echo "**** cleanup ****" && \ rm -rf \ + /opt/radarr/Radarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* -# add local files -COPY /root / +# copy local files +COPY root/ / # ports and volumes EXPOSE 7878 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 492d722..65efa68 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/mono:arm64v8-LTS +FROM lsiobase/ubuntu:arm64v8-bionic # set version label ARG BUILD_DATE @@ -9,36 +9,37 @@ LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" +ARG RADARR_BRANCH="aphrodite" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install jq ****" && \ + echo "**** install packages ****" && \ apt-get update && \ - apt-get install -y \ - jq && \ + apt-get install --no-install-recommends -y \ + jq \ + libicu60 \ + libmediainfo0v5 && \ echo "**** install radarr ****" && \ + mkdir -p /opt/radarr && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL "https://radarr.aeonlucid.com/v1/update/aphrodite/changes?os=linux" \ + RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ fi && \ - RADARR_DURL=$(curl -sL "https://radarr.aeonlucid.com/v1/update/aphrodite/changes?os=linux" \ - | jq -r "first(.[] | select(.version == \"${RADARR_RELEASE}\")) | .url") && \ - mkdir -p \ - /opt/radarr && \ curl -o \ - /tmp/radar.tar.gz -L \ - "${RADARR_DURL}" && \ + /tmp/radarr.tar.gz -L \ + "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \ tar ixzf \ - /tmp/radar.tar.gz -C \ + /tmp/radarr.tar.gz -C \ /opt/radarr --strip-components=1 && \ - echo "**** clean up ****" && \ + echo "**** cleanup ****" && \ rm -rf \ + /opt/radarr/Radarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* -# add local files -COPY /root / +# copy local files +COPY root/ / # ports and volumes EXPOSE 7878 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 32978a8..be1f08f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/mono:arm32v7-LTS +FROM lsiobase/ubuntu:arm32v7-bionic # set version label ARG BUILD_DATE @@ -9,36 +9,37 @@ LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" +ARG RADARR_BRANCH="aphrodite" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install jq ****" && \ + echo "**** install packages ****" && \ apt-get update && \ - apt-get install -y \ - jq && \ + apt-get install --no-install-recommends -y \ + jq \ + libicu60 \ + libmediainfo0v5 && \ echo "**** install radarr ****" && \ + mkdir -p /opt/radarr && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL "https://radarr.aeonlucid.com/v1/update/aphrodite/changes?os=linux" \ + RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ fi && \ - RADARR_DURL=$(curl -sL "https://radarr.aeonlucid.com/v1/update/aphrodite/changes?os=linux" \ - | jq -r "first(.[] | select(.version == \"${RADARR_RELEASE}\")) | .url") && \ - mkdir -p \ - /opt/radarr && \ curl -o \ - /tmp/radar.tar.gz -L \ - "${RADARR_DURL}" && \ + /tmp/radarr.tar.gz -L \ + "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \ tar ixzf \ - /tmp/radar.tar.gz -C \ + /tmp/radarr.tar.gz -C \ /opt/radarr --strip-components=1 && \ - echo "**** clean up ****" && \ + echo "**** cleanup ****" && \ rm -rf \ + /opt/radarr/Radarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* -# add local files -COPY /root / +# copy local files +COPY root/ / # ports and volumes EXPOSE 7878 diff --git a/Jenkinsfile b/Jenkinsfile index b8287dc..59b96e4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,7 +101,7 @@ pipeline { steps{ script{ env.EXT_RELEASE = sh( - script: ''' curl -sL https://radarr.aeonlucid.com/v1/update/aphrodite/changes?os=linux | jq -r '.[0].version' ''', + script: ''' curl -sL https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux | jq -r '.[0].version' ''', returnStdout: true).trim() env.RELEASE_LINK = 'custom_command' } diff --git a/README.md b/README.md index 04e72d2..3a9e1ab 100644 --- a/README.md +++ b/README.md @@ -207,6 +207,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **10.15.19:** - Use Netcore builds for preview branch. * **08.09.19:** - Pull artifacts from new upstream Azure build env. * **01.08.19:** - Rebase to Linuxserver LTS mono version. * **13.06.19:** - Add env variable for setting umask. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index e988ac7..4b9a19c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-radarr external_type: na -custom_version_command: curl -sL https://radarr.aeonlucid.com/v1/update/aphrodite/changes?os=linux | jq -r '.[0].version' +custom_version_command: curl -sL https://radarr.lidarr.audio/v1/update/aphrodite/changes?os=linux | jq -r '.[0].version' release_type: prerelease release_tag: preview ls_branch: preview diff --git a/readme-vars.yml b/readme-vars.yml index f36e499..c73f09d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "10.15.19:", desc: "Use Netcore builds for preview branch." } - { date: "08.09.19:", desc: "Pull artifacts from new upstream Azure build env." } - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config index 0397230..cb95d64 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -2,6 +2,4 @@ # permissions chown -R abc:abc \ - /config \ - /opt - + /config diff --git a/root/etc/services.d/radarr/run b/root/etc/services.d/radarr/run index 7214523..037e032 100644 --- a/root/etc/services.d/radarr/run +++ b/root/etc/services.d/radarr/run @@ -4,8 +4,6 @@ UMASK_SET=${UMASK_SET:-022} umask "$UMASK_SET" -cd /opt/radarr || exit - exec \ - s6-setuidgid abc mono --debug Radarr.exe \ + s6-setuidgid abc /opt/radarr/Radarr \ -nobrowser -data=/config