diff --git a/Dockerfile b/Dockerfile index 90d677e..29bb162 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN \ jq \ libicu60 && \ echo "**** install lidarr ****" && \ - mkdir -p /app/lidarr && \ + mkdir -p /app/lidarr/bin && \ if [ -z ${LIDARR_RELEASE+x} ]; then \ LIDARR_RELEASE=$(curl -sL "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ @@ -29,10 +29,11 @@ RUN \ "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/updatefile?version=${LIDARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \ tar ixzf \ /tmp/lidarr.tar.gz -C \ - /app/lidarr --strip-components=1 && \ + /app/lidarr/bin --strip-components=1 && \ + echo "UpdateMethod=docker\nBranch=${LIDARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/lidarr/package_info && \ echo "**** cleanup ****" && \ rm -rf \ - /app/lidarr/Lidarr.Update \ + /app/lidarr/bin/Lidarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index acb9fd3..31136dd 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -19,7 +19,7 @@ RUN \ jq \ libicu60 && \ echo "**** install lidarr ****" && \ - mkdir -p /app/lidarr && \ + mkdir -p /app/lidarr/bin && \ if [ -z ${LIDARR_RELEASE+x} ]; then \ LIDARR_RELEASE=$(curl -sL "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ @@ -29,10 +29,11 @@ RUN \ "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/updatefile?version=${LIDARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \ tar ixzf \ /tmp/lidarr.tar.gz -C \ - /app/lidarr --strip-components=1 && \ + /app/lidarr/bin --strip-components=1 && \ + echo "UpdateMethod=docker\nBranch=${LIDARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/lidarr/package_info && \ echo "**** cleanup ****" && \ rm -rf \ - /app/lidarr/Lidarr.Update \ + /app/lidarr/bin/Lidarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* diff --git a/Dockerfile.armhf b/Dockerfile.armhf index bac9beb..df457fe 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -19,7 +19,7 @@ RUN \ jq \ libicu60 && \ echo "**** install lidarr ****" && \ - mkdir -p /app/lidarr && \ + mkdir -p /app/lidarr/bin && \ if [ -z ${LIDARR_RELEASE+x} ]; then \ LIDARR_RELEASE=$(curl -sL "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/changes?os=linux" \ | jq -r '.[0].version'); \ @@ -29,10 +29,11 @@ RUN \ "https://services.lidarr.audio/v1/update/${LIDARR_BRANCH}/updatefile?version=${LIDARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \ tar ixzf \ /tmp/lidarr.tar.gz -C \ - /app/lidarr --strip-components=1 && \ + /app/lidarr/bin --strip-components=1 && \ + echo "UpdateMethod=docker\nBranch=${LIDARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/lidarr/package_info && \ echo "**** cleanup ****" && \ rm -rf \ - /app/lidarr/Lidarr.Update \ + /app/lidarr/bin/Lidarr.Update \ /tmp/* \ /var/lib/apt/lists/* \ /var/tmp/* diff --git a/readme-vars.yml b/readme-vars.yml index cf75ce5..94f9213 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "05.04.20:", desc: "Move app to /app." } - { date: "29.10.19:", desc: "Switch preview branch to netcore builds." } - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." } - { date: "13.06.19:", desc: "Add env variable for setting umask." } diff --git a/root/etc/services.d/lidarr/run b/root/etc/services.d/lidarr/run index a88357d..02239bc 100644 --- a/root/etc/services.d/lidarr/run +++ b/root/etc/services.d/lidarr/run @@ -1,10 +1,8 @@ #!/usr/bin/with-contenv bash -# cd /app/lidarr || exit - UMASK_SET=${UMASK_SET:-022} umask "$UMASK_SET" exec \ - s6-setuidgid abc /app/lidarr/Lidarr \ + s6-setuidgid abc /app/lidarr/bin/Lidarr \ -nobrowser -data=/config