From 9adcf4b7ada29795d443245fbc58e922ac6165c5 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Sun, 5 Apr 2020 02:42:14 -0500
Subject: [PATCH 1/2] 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 cea2576..89b812f 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 6826c05..ba43c5f 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 fb35d9c..3eeb7f4 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 cdf86c5..9808122 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -48,6 +48,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "05.04.20:", desc: "Move app to /app." }
   - { date: "13.06.19:", desc: "Add env variable for setting umask." }
   - { date: "10.05.19:", desc: "Rebase to Bionic." }
   - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
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 \

From 3284adc28702a085f0ef19b46a73da93ae88e92b Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Wed, 8 Apr 2020 16:38:42 -0500
Subject: [PATCH 2/2] Fix perms on /app

---
 root/etc/cont-init.d/30-config | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index 0397230..a8bfaf6 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -3,5 +3,4 @@
 # permissions
 chown -R abc:abc \
 	/config \
-	/opt
-
+	/app