haeaeae/docker-sonarr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #148 from linuxserver/app_folder

Browse Source 
Move to /app
This commit is contained in:
Eric Nemchik
2020-04-05 01:46:27 -05:00
committed by GitHub
parent 1004f424cd 46113dbf25
commit b3cc13a9ac
5 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+4 -4
View File
@@ -18,7 +18,7 @@ RUN \
apt-get install -y \
jq && \
echo "**** install sonarr ****" && \
mkdir -p /usr/lib/sonarr/bin && \
mkdir -p /app/sonarr/bin && \
if [ -z ${SONARR_VERSION+x} ]; then \
SONARR_VERSION=$(curl -sX GET https://services.sonarr.tv/v1/download/${SONARR_BRANCH}?version=3 \
| jq -r '.version'); \
@@ -28,9 +28,9 @@ RUN \
"https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
tar xf \
/tmp/sonarr.tar.gz -C \
/usr/lib/sonarr/bin --strip-components=1 && \
echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /usr/lib/sonarr/package_info && \
rm -rf /usr/lib/sonarr/bin/Sonarr.Update && \
/app/sonarr/bin --strip-components=1 && \
echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/sonarr/package_info && \
rm -rf /app/sonarr/bin/Sonarr.Update && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
Dockerfile.aarch64
+4 -4
View File
@@ -18,7 +18,7 @@ RUN \
apt-get install -y \
jq && \
echo "**** install sonarr ****" && \
mkdir -p /usr/lib/sonarr/bin && \
mkdir -p /app/sonarr/bin && \
if [ -z ${SONARR_VERSION+x} ]; then \
SONARR_VERSION=$(curl -sX GET https://services.sonarr.tv/v1/download/${SONARR_BRANCH}?version=3 \
| jq -r '.version'); \
@@ -28,9 +28,9 @@ RUN \
"https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
tar xf \
/tmp/sonarr.tar.gz -C \
/usr/lib/sonarr/bin --strip-components=1 && \
echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /usr/lib/sonarr/package_info && \
rm -rf /usr/lib/sonarr/bin/Sonarr.Update && \
/app/sonarr/bin --strip-components=1 && \
echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/sonarr/package_info && \
rm -rf /app/sonarr/bin/Sonarr.Update && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
Dockerfile.armhf
+4 -4
View File
@@ -18,7 +18,7 @@ RUN \
apt-get install -y \
jq && \
echo "**** install sonarr ****" && \
mkdir -p /usr/lib/sonarr/bin && \
mkdir -p /app/sonarr/bin && \
if [ -z ${SONARR_VERSION+x} ]; then \
SONARR_VERSION=$(curl -sX GET https://services.sonarr.tv/v1/download/${SONARR_BRANCH}?version=3 \
| jq -r '.version'); \
@@ -28,9 +28,9 @@ RUN \
"https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
tar xf \
/tmp/sonarr.tar.gz -C \
/usr/lib/sonarr/bin --strip-components=1 && \
echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /usr/lib/sonarr/package_info && \
rm -rf /usr/lib/sonarr/bin/Sonarr.Update && \
/app/sonarr/bin --strip-components=1 && \
echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/sonarr/package_info && \
rm -rf /app/sonarr/bin/Sonarr.Update && \
echo "**** cleanup ****" && \
apt-get clean && \
rm -rf \
root/etc/cont-init.d/30-config
+1 -1
View File
@@ -6,5 +6,5 @@
# permissions
chown -R abc:abc \
/usr/lib/sonarr \
/app/sonarr \
/config
root/etc/services.d/sonarr/run
+1 -2
View File
@@ -1,10 +1,9 @@
#!/usr/bin/with-contenv bash
UMASK_SET=${UMASK_SET:-022}
umask "$UMASK_SET"
cd /usr/lib/sonarr/bin || exit
cd /app/sonarr/bin || exit
exec \
s6-setuidgid abc mono --debug Sonarr.exe \