Merge pull request #90 from linuxserver/package_info

Move to /app

Dockerfile

@@ -17,11 +17,11 @@ RUN \
  apt-get update && \
  apt-get install --no-install-recommends -y \
 	jq \
-	libicu65 \
+	libicu66 \
 	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/*

Dockerfile.aarch64

@@ -17,11 +17,11 @@ RUN \
  apt-get update && \
  apt-get install --no-install-recommends -y \
 	jq \
-	libicu65 \
+	libicu66 \
 	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/*

Dockerfile.armhf

@@ -17,11 +17,11 @@ RUN \
  apt-get update && \
  apt-get install --no-install-recommends -y \
 	jq \
-	libicu65 \
+	libicu66 \
 	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/*

package_versions.txt

@@ -18,7 +18,7 @@ dpkg1.19.7ubuntu2
 e2fsprogs1.45.3-4ubuntu2
 fdisk2.34-0.1ubuntu4
 findutils4.6.0+git+20190209-2ubuntu1
-gcc-10-base10-20200222-1ubuntu1
+gcc-10-base10-20200304-1ubuntu1
 gcc-9-base9.2.1-21ubuntu1
 gnupg2.2.17-3ubuntu1
 gnupg-l10n2.2.17-3ubuntu1
@@ -58,7 +58,7 @@ libext2fs21.45.3-4ubuntu2
 libfdisk12.34-0.1ubuntu4
 libffi63.2.1-9
 libgcc11:9.2.1-21ubuntu1
-libgcc-s110-20200222-1ubuntu1
+libgcc-s110-20200304-1ubuntu1
 libgcrypt201.8.5-3ubuntu1
 libgmp102:6.1.2+dfsg-4
 libgnutls303.6.11.1-2
@@ -70,7 +70,7 @@ libheimbase1-heimdal7.7.0+dfsg-1
 libheimntlm0-heimdal7.7.0+dfsg-1
 libhogweed53.5.1+really3.5.1-2
 libhx509-5-heimdal7.7.0+dfsg-1
-libicu6565.1-1ubuntu2
+libicu6666.1-2ubuntu2
 libidn2-02.2.0-2
 libjq11.6-1
 libk5crypto31.17-6ubuntu4
@@ -83,7 +83,7 @@ libldap-2.4-22.4.49+dfsg-1ubuntu1
 libldap-common2.4.49+dfsg-1ubuntu1
 liblz4-11.9.2-2
 liblzma55.2.4-1
-libmediainfo0v519.09+dfsg-2
+libmediainfo0v519.09+dfsg-2build1
 libmms00.6.4-3
 libmount12.34-0.1ubuntu4
 libncurses66.1+20191019-1ubuntu1
@@ -113,20 +113,20 @@ libsemanage13.0-1
 libsemanage-common3.0-1
 libsepol13.0-1
 libsmartcols12.34-0.1ubuntu4
-libsqlite3-03.31.1-1ubuntu1
+libsqlite3-03.31.1-4
 libss21.45.3-4ubuntu2
 libssh-40.9.3-2ubuntu1
-libssl1.11.1.1d-2ubuntu3
+libssl1.11.1.1d-2ubuntu6
 libstdc++69.2.1-21ubuntu1
 libsystemd0244-3ubuntu1
 libtasn1-64.15.0-2
 libtinfo66.1+20191019-1ubuntu1
-libtinyxml2-6a7.0.0+dfsg-1
+libtinyxml2-6a7.0.0+dfsg-1build1
 libudev1244-3ubuntu1
 libunistring20.9.10-2
 libuuid12.34-0.1ubuntu4
 libwind0-heimdal7.7.0+dfsg-1
-libzen0v50.4.37-1
+libzen0v50.4.37-1build1
 libzstd11.4.4+dfsg-1
 locales2.30-0ubuntu3
 login1:4.5-1.1ubuntu4
@@ -136,7 +136,7 @@ mawk1.3.3-17ubuntu3
 mount2.34-0.1ubuntu4
 ncurses-base6.1+20191019-1ubuntu1
 ncurses-bin6.1+20191019-1ubuntu1
-openssl1.1.1d-2ubuntu3
+openssl1.1.1d-2ubuntu6
 passwd1:4.5-1.1ubuntu4
 perl-base5.30.0-9
 pinentry-curses1.1.0-3
@@ -145,10 +145,10 @@ publicsuffix20200201.2258-1
 readline-common8.0-4
 sed4.7-1
 sensible-utils0.0.12+nmu1
-sqlite33.31.1-1ubuntu1
+sqlite33.31.1-4
 sysvinit-utils2.96-1ubuntu1
 tar1.30+dfsg-6
-tzdata2019c-3
+tzdata2019c-3ubuntu1
 ubuntu-keyring2018.09.18.1
 util-linux2.34-0.1ubuntu4
 zlib1g1:1.2.11.dfsg-1ubuntu3

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