From 9a4ee6ae29e333d1aa087e8afee01d020a3f7178 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 5 Apr 2020 02:44:10 -0500 Subject: [PATCH] Move app to /app --- Dockerfile | 4 ++-- Dockerfile.aarch64 | 4 ++-- Dockerfile.armhf | 4 ++-- readme-vars.yml | 1 + root/etc/services.d/radarr/run | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 04d71a1..92992c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,13 +25,13 @@ RUN \ radarr_url=$(curl -k -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ | select(.version == \"${RADARR_RELEASE}\") | .url") && \ mkdir -p \ - /opt/radarr && \ + /app/radarr/bin && \ curl -o \ /tmp/radar.tar.gz -L \ "${radarr_url}" && \ tar ixzf \ /tmp/radar.tar.gz -C \ - /opt/radarr --strip-components=1 && \ + /app/radarr/bin --strip-components=1 && \ echo "**** clean up ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9c0ba65..179b454 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -25,13 +25,13 @@ RUN \ radarr_url=$(curl -k -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ | select(.version == \"${RADARR_RELEASE}\") | .url") && \ mkdir -p \ - /opt/radarr && \ + /app/radarr/bin && \ curl -o \ /tmp/radar.tar.gz -L \ "${radarr_url}" && \ tar ixzf \ /tmp/radar.tar.gz -C \ - /opt/radarr --strip-components=1 && \ + /app/radarr/bin --strip-components=1 && \ echo "**** clean up ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b5688ca..644eeb4 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -25,13 +25,13 @@ RUN \ radarr_url=$(curl -k -sX GET "https://radarr.aeonlucid.com/v1/update/${RADARR_BRANCH}/changes?os=linux" |jq -r ".[] \ | select(.version == \"${RADARR_RELEASE}\") | .url") && \ mkdir -p \ - /opt/radarr && \ + /app/radarr/bin && \ curl -o \ /tmp/radar.tar.gz -L \ "${radarr_url}" && \ tar ixzf \ /tmp/radar.tar.gz -C \ - /opt/radarr --strip-components=1 && \ + /app/radarr/bin --strip-components=1 && \ echo "**** clean up ****" && \ rm -rf \ /tmp/* \ diff --git a/readme-vars.yml b/readme-vars.yml index 06fe750..1c4e63c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -52,6 +52,7 @@ app_setup_block: | # changelog changelogs: + - { date: "05.04.20:", desc: "Move app to /app." } - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } - { date: "10.05.19:", desc: "Rebase to Bionic." } diff --git a/root/etc/services.d/radarr/run b/root/etc/services.d/radarr/run index 7214523..4932883 100644 --- a/root/etc/services.d/radarr/run +++ b/root/etc/services.d/radarr/run @@ -4,7 +4,7 @@ UMASK_SET=${UMASK_SET:-022} umask "$UMASK_SET" -cd /opt/radarr || exit +cd /app/radarr/bin || exit exec \ s6-setuidgid abc mono --debug Radarr.exe \