From 349825c00a36b5283c145613583704a7b99273ab Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Fri, 3 Apr 2020 22:27:56 -0500
Subject: [PATCH] Move to /app

---
 Dockerfile                     | 7 ++++---
 Dockerfile.aarch64             | 7 ++++---
 Dockerfile.armhf               | 7 ++++---
 root/etc/services.d/radarr/run | 3 +--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bcba488..f324ada 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN \
 	libmediainfo0v5 \
 	sqlite3 && \
  echo "**** install radarr ****" && \
- mkdir -p /opt/radarr && \
+ mkdir -p /app/radarr/bin && \
  if [ -z ${RADARR_RELEASE+x} ]; then \
 	RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \
 	| jq -r '.[0].version'); \
@@ -31,10 +31,11 @@ RUN \
 	"https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \
  tar ixzf \
  /tmp/radarr.tar.gz -C \
-	/opt/radarr --strip-components=1 && \
+	/app/radarr/bin --strip-components=1 && \
+ echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \
  echo "**** cleanup ****" && \
  rm -rf \
-	/opt/radarr/Radarr.Update \
+	/app/radarr/bin/Radarr.Update \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index e73af1e..975c73c 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -21,7 +21,7 @@ RUN \
 	libmediainfo0v5 \
 	sqlite3 && \
  echo "**** install radarr ****" && \
- mkdir -p /opt/radarr && \
+ mkdir -p /app/radarr/bin && \
  if [ -z ${RADARR_RELEASE+x} ]; then \
 	RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \
 	| jq -r '.[0].version'); \
@@ -31,10 +31,11 @@ RUN \
 	"https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \
  tar ixzf \
  /tmp/radarr.tar.gz -C \
-	/opt/radarr --strip-components=1 && \
+	/app/radarr/bin --strip-components=1 && \
+ echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \
  echo "**** cleanup ****" && \
  rm -rf \
-	/opt/radarr/Radarr.Update \
+	/app/radarr/bin/Radarr.Update \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 36b5eaf..9bf10d0 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -21,7 +21,7 @@ RUN \
 	libmediainfo0v5 \
 	sqlite3 && \
  echo "**** install radarr ****" && \
- mkdir -p /opt/radarr && \
+ mkdir -p /app/radarr/bin && \
  if [ -z ${RADARR_RELEASE+x} ]; then \
 	RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \
 	| jq -r '.[0].version'); \
@@ -31,10 +31,11 @@ RUN \
 	"https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \
  tar ixzf \
  /tmp/radarr.tar.gz -C \
-	/opt/radarr --strip-components=1 && \
+	/app/radarr/bin --strip-components=1 && \
  echo "**** cleanup ****" && \
+ echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \
  rm -rf \
-	/opt/radarr/Radarr.Update \
+	/app/radarr/bin/Radarr.Update \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
diff --git a/root/etc/services.d/radarr/run b/root/etc/services.d/radarr/run
index 037e032..6197abc 100644
--- a/root/etc/services.d/radarr/run
+++ b/root/etc/services.d/radarr/run
@@ -1,9 +1,8 @@
 #!/usr/bin/with-contenv bash
 
 UMASK_SET=${UMASK_SET:-022}
-
 umask "$UMASK_SET"
 
 exec \
-	s6-setuidgid abc /opt/radarr/Radarr \
+	s6-setuidgid abc /app/radarr/bin/Radarr \
 	-nobrowser -data=/config