From 7e95fffe5015a144fd3a81604c5ec0e0ed464d09 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 5 Apr 2020 02:38:55 -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 3f0af75..1198985 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,13 +24,13 @@ RUN \ radarr_url=$(curl -s https://api.github.com/repos/Radarr/Radarr/releases/tags/"${RADARR_RELEASE}" \ |jq -r '.assets[].browser_download_url' |grep linux) && \ 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 d2bcad5..2feed29 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -24,13 +24,13 @@ RUN \ radarr_url=$(curl -s https://api.github.com/repos/Radarr/Radarr/releases/tags/"${RADARR_RELEASE}" \ |jq -r '.assets[].browser_download_url' |grep linux) && \ 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 2a2c561..9b5a4dd 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -24,13 +24,13 @@ RUN \ radarr_url=$(curl -s https://api.github.com/repos/Radarr/Radarr/releases/tags/"${RADARR_RELEASE}" \ |jq -r '.assets[].browser_download_url' |grep linux) && \ 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 130a47c..cfc7ca9 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 \