diff --git a/Dockerfile b/Dockerfile index 912433a..ce8061c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM lsiobase/ubuntu:bionic +FROM lsiobase/mono:LTS # set version label ARG BUILD_DATE @@ -9,37 +9,36 @@ LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" -ARG RADARR_BRANCH="aphrodite" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install packages ****" && \ + echo "**** install jq ****" && \ apt-get update && \ - apt-get install --no-install-recommends -y \ - jq \ - libicu60 \ - libmediainfo0v5 && \ + apt-get install -y \ + jq && \ echo "**** install radarr ****" && \ - mkdir -p /opt/radarr && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + RADARR_RELEASE=$(curl -sL "https://radarr.aeonlucid.com/v1/update/aphrodite/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/radarr.tar.gz -L \ - "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \ + /tmp/radar.tar.gz -L \ + "${RADARR_DURL}" && \ tar ixzf \ - /tmp/radarr.tar.gz -C \ + /tmp/radar.tar.gz -C \ /opt/radarr --strip-components=1 && \ - echo "**** cleanup ****" && \ + echo "**** clean up ****" && \ rm -rf \ - /opt/radarr/Radarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* -# copy local files -COPY root/ / +# add local files +COPY /root / # ports and volumes EXPOSE 7878 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a42b345..492d722 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM lsiobase/ubuntu:arm64v8-bionic +FROM lsiobase/mono:arm64v8-LTS # set version label ARG BUILD_DATE @@ -9,37 +9,36 @@ LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" -ARG RADARR_BRANCH="aphrodite" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install packages ****" && \ + echo "**** install jq ****" && \ apt-get update && \ - apt-get install --no-install-recommends -y \ - jq \ - libicu60 - libmediainfo0v5 && \ + apt-get install -y \ + jq && \ echo "**** install radarr ****" && \ - mkdir -p /opt/radarr && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + RADARR_RELEASE=$(curl -sL "https://radarr.aeonlucid.com/v1/update/aphrodite/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/radarr.tar.gz -L \ - "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \ + /tmp/radar.tar.gz -L \ + "${RADARR_DURL}" && \ tar ixzf \ - /tmp/radarr.tar.gz -C \ + /tmp/radar.tar.gz -C \ /opt/radarr --strip-components=1 && \ - echo "**** cleanup ****" && \ + echo "**** clean up ****" && \ rm -rf \ - /opt/radarr/Radarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* -# copy local files -COPY root/ / +# add local files +COPY /root / # ports and volumes EXPOSE 7878 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index be1f08f..32978a8 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM lsiobase/ubuntu:arm32v7-bionic +FROM lsiobase/mono:arm32v7-LTS # set version label ARG BUILD_DATE @@ -9,37 +9,36 @@ LABEL maintainer="thelamer" # environment settings ARG DEBIAN_FRONTEND="noninteractive" -ARG RADARR_BRANCH="aphrodite" ENV XDG_CONFIG_HOME="/config/xdg" RUN \ - echo "**** install packages ****" && \ + echo "**** install jq ****" && \ apt-get update && \ - apt-get install --no-install-recommends -y \ - jq \ - libicu60 \ - libmediainfo0v5 && \ + apt-get install -y \ + jq && \ echo "**** install radarr ****" && \ - mkdir -p /opt/radarr && \ if [ -z ${RADARR_RELEASE+x} ]; then \ - RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \ + RADARR_RELEASE=$(curl -sL "https://radarr.aeonlucid.com/v1/update/aphrodite/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/radarr.tar.gz -L \ - "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \ + /tmp/radar.tar.gz -L \ + "${RADARR_DURL}" && \ tar ixzf \ - /tmp/radarr.tar.gz -C \ + /tmp/radar.tar.gz -C \ /opt/radarr --strip-components=1 && \ - echo "**** cleanup ****" && \ + echo "**** clean up ****" && \ rm -rf \ - /opt/radarr/Radarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* -# copy local files -COPY root/ / +# add local files +COPY /root / # ports and volumes EXPOSE 7878 diff --git a/README.md b/README.md index 3a9e1ab..04e72d2 100644 --- a/README.md +++ b/README.md @@ -207,7 +207,6 @@ 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/readme-vars.yml b/readme-vars.yml index c73f09d..f36e499 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,7 +46,6 @@ 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 cb95d64..0397230 100644 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/cont-init.d/30-config @@ -2,4 +2,6 @@ # permissions chown -R abc:abc \ - /config + /config \ + /opt + diff --git a/root/etc/services.d/radarr/run b/root/etc/services.d/radarr/run index 037e032..7214523 100644 --- a/root/etc/services.d/radarr/run +++ b/root/etc/services.d/radarr/run @@ -4,6 +4,8 @@ UMASK_SET=${UMASK_SET:-022} umask "$UMASK_SET" +cd /opt/radarr || exit + exec \ - s6-setuidgid abc /opt/radarr/Radarr \ + s6-setuidgid abc mono --debug Radarr.exe \ -nobrowser -data=/config