Merge pull request #151 from linuxserver/develop-app

Move app to /app

Author: aptalca

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 \

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 \

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 \

readme-vars.yml

@@ -48,6 +48,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." }

root/etc/cont-init.d/30-config

@@ -6,4 +6,4 @@
 
 # permissions
 chown -R abc:abc \
-	/opt/NzbDrone
+	/app/sonarr/bin

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 \