From a99429901f7e384b99915f0955412aef1f011aa7 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Sun, 5 Apr 2020 02:15:10 -0500
Subject: [PATCH] Move app to /app

---
 Dockerfile                     | 4 ++--
 Dockerfile.aarch64             | 4 ++--
 Dockerfile.armhf               | 4 ++--
 readme-vars.yml                | 1 +
 root/etc/cont-init.d/30-config | 2 +-
 root/etc/services.d/sonarr/run | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bac38cd..fd4d088 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ RUN \
  apt-get install -y \
         jq && \
  echo "**** install sonarr ****" && \
- mkdir -p /opt/NzbDrone && \
+ mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
 	SONARR_VERSION=$(curl -sX GET https://services.sonarr.tv/v1/download/${SONARR_BRANCH} \
 	| jq -r '.version'); \
@@ -28,7 +28,7 @@ RUN \
 	"https://download.sonarr.tv/v2/${SONARR_BRANCH}/mono/NzbDrone.${SONARR_BRANCH}.${SONARR_VERSION}.mono.tar.gz" && \
  tar xf \
 	/tmp/sonarr.tar.gz -C \
-	/opt/NzbDrone --strip-components=1 && \
+	/app/sonarr/bin --strip-components=1 && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 709b370..013d763 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -18,7 +18,7 @@ RUN \
  apt-get install -y \
         jq && \
  echo "**** install sonarr ****" && \
- mkdir -p /opt/NzbDrone && \
+ mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
 	SONARR_VERSION=$(curl -sX GET https://services.sonarr.tv/v1/download/${SONARR_BRANCH} \
 	| jq -r '.version'); \
@@ -28,7 +28,7 @@ RUN \
 	"https://download.sonarr.tv/v2/${SONARR_BRANCH}/mono/NzbDrone.${SONARR_BRANCH}.${SONARR_VERSION}.mono.tar.gz" && \
  tar xf \
 	/tmp/sonarr.tar.gz -C \
-	/opt/NzbDrone --strip-components=1 && \
+	/app/sonarr/bin --strip-components=1 && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 5d56bcf..6c215cd 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -18,7 +18,7 @@ RUN \
  apt-get install -y \
         jq && \
  echo "**** install sonarr ****" && \
- mkdir -p /opt/NzbDrone && \
+ mkdir -p /app/sonarr/bin && \
   if [ -z ${SONARR_VERSION+x} ]; then \
 	SONARR_VERSION=$(curl -sX GET https://services.sonarr.tv/v1/download/${SONARR_BRANCH} \
 	| jq -r '.version'); \
@@ -28,7 +28,7 @@ RUN \
 	"https://download.sonarr.tv/v2/${SONARR_BRANCH}/mono/NzbDrone.${SONARR_BRANCH}.${SONARR_VERSION}.mono.tar.gz" && \
  tar xf \
 	/tmp/sonarr.tar.gz -C \
-	/opt/NzbDrone --strip-components=1 && \
+	/app/sonarr/bin --strip-components=1 && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/readme-vars.yml b/readme-vars.yml
index 1996e95..023e0c2 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -50,6 +50,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/cont-init.d/30-config b/root/etc/cont-init.d/30-config
index 7a279d1..9f71932 100644
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -6,4 +6,4 @@
 
 # permissions
 chown -R abc:abc \
-	/opt/NzbDrone
+	/app/sonarr/bin
diff --git a/root/etc/services.d/sonarr/run b/root/etc/services.d/sonarr/run
index 442ae89..f603c57 100644
--- a/root/etc/services.d/sonarr/run
+++ b/root/etc/services.d/sonarr/run
@@ -4,7 +4,7 @@ UMASK_SET=${UMASK_SET:-022}
 
 umask "$UMASK_SET"
 
-cd /opt/NzbDrone || exit
+cd /app/sonarr/bin || exit
 
 exec \
 	s6-setuidgid abc mono --debug NzbDrone.exe \