Remove old umask functionality

2021-10-10 20:37:33 +02:00
parent 839e554f4e
commit faad03c35f
5 changed files with 52 additions and 57 deletions
--- a/32
+++ b/32
@@ -13,28 +13,28 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 ENV SONARR_BRANCH="develop"

 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
+  echo "**** install packages ****" && \
+  apt-get update && \
+  apt-get install -y \
    jq \
    libmediainfo0v5 && \
- echo "**** install sonarr ****" && \
- mkdir -p /app/sonarr/bin && \
-    if [ -z ${SONARR_VERSION+x} ]; then \
-        SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/releases \
-        | jq -r ".[] | select(.branch==\"$SONARR_BRANCH\") | .version"); \
-    fi && \
- curl -o \
+  echo "**** install sonarr ****" && \
+  mkdir -p /app/sonarr/bin && \
+  if [ -z ${SONARR_VERSION+x} ]; then \
+    SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/releases \
+    | jq -r ".[] | select(.branch==\"$SONARR_BRANCH\") | .version"); \
+  fi && \
+  curl -o \
    /tmp/sonarr.tar.gz -L \
    "https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
- tar xf \
+  tar xf \
    /tmp/sonarr.tar.gz -C \
    /app/sonarr/bin --strip-components=1 && \
- echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/sonarr/package_info && \
- rm -rf /app/sonarr/bin/Sonarr.Update && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
+  echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/sonarr/package_info && \
+  rm -rf /app/sonarr/bin/Sonarr.Update && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
    /tmp/* \
    /var/tmp/*

--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -13,28 +13,28 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 ENV SONARR_BRANCH="develop"

 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
+  echo "**** install packages ****" && \
+  apt-get update && \
+  apt-get install -y \
    jq \
    libmediainfo0v5 && \
- echo "**** install sonarr ****" && \
- mkdir -p /app/sonarr/bin && \
-    if [ -z ${SONARR_VERSION+x} ]; then \
-        SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/releases \
-        | jq -r ".[] | select(.branch==\"$SONARR_BRANCH\") | .version"); \
-    fi && \
- curl -o \
+  echo "**** install sonarr ****" && \
+  mkdir -p /app/sonarr/bin && \
+  if [ -z ${SONARR_VERSION+x} ]; then \
+    SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/releases \
+    | jq -r ".[] | select(.branch==\"$SONARR_BRANCH\") | .version"); \
+  fi && \
+  curl -o \
    /tmp/sonarr.tar.gz -L \
    "https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
- tar xf \
+  tar xf \
    /tmp/sonarr.tar.gz -C \
    /app/sonarr/bin --strip-components=1 && \
- echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/sonarr/package_info && \
- rm -rf /app/sonarr/bin/Sonarr.Update && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
+  echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/sonarr/package_info && \
+  rm -rf /app/sonarr/bin/Sonarr.Update && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
    /tmp/* \
    /var/tmp/*

--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -13,28 +13,28 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 ENV SONARR_BRANCH="develop"

 RUN \
- echo "**** install packages ****" && \
- apt-get update && \
- apt-get install -y \
+  echo "**** install packages ****" && \
+  apt-get update && \
+  apt-get install -y \
    jq \
    libmediainfo0v5 && \
- echo "**** install sonarr ****" && \
- mkdir -p /app/sonarr/bin && \
-    if [ -z ${SONARR_VERSION+x} ]; then \
-        SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/releases \
-        | jq -r ".[] | select(.branch==\"$SONARR_BRANCH\") | .version"); \
-    fi && \
- curl -o \
+  echo "**** install sonarr ****" && \
+  mkdir -p /app/sonarr/bin && \
+  if [ -z ${SONARR_VERSION+x} ]; then \
+    SONARR_VERSION=$(curl -sX GET http://services.sonarr.tv/v1/releases \
+    | jq -r ".[] | select(.branch==\"$SONARR_BRANCH\") | .version"); \
+  fi && \
+  curl -o \
    /tmp/sonarr.tar.gz -L \
    "https://download.sonarr.tv/v3/${SONARR_BRANCH}/${SONARR_VERSION}/Sonarr.${SONARR_BRANCH}.${SONARR_VERSION}.linux.tar.gz" && \
- tar xf \
+  tar xf \
    /tmp/sonarr.tar.gz -C \
    /app/sonarr/bin --strip-components=1 && \
- echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/sonarr/package_info && \
- rm -rf /app/sonarr/bin/Sonarr.Update && \
- echo "**** cleanup ****" && \
- apt-get clean && \
- rm -rf \
+  echo "UpdateMethod=docker\nBranch=${SONARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/sonarr/package_info && \
+  rm -rf /app/sonarr/bin/Sonarr.Update && \
+  echo "**** cleanup ****" && \
+  apt-get clean && \
+  rm -rf \
    /tmp/* \
    /var/tmp/*

--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -2,8 +2,8 @@

 # cleanup pid if it exists
 [[ -e /config/sonarr.pid ]] && \
-	rm -rf /config/sonarr.pid
+    rm -rf /config/sonarr.pid

 # permissions
 chown -R abc:abc \
-	/app/sonarr/bin
+    /app/sonarr/bin
--- a/root/etc/services.d/sonarr/run
+++ b/root/etc/services.d/sonarr/run
@@ -1,12 +1,7 @@
 #!/usr/bin/with-contenv bash

-if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
-  echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
-  umask ${UMASK_SET}
-fi
-
 cd /app/sonarr/bin || exit

 exec \
-  s6-setuidgid abc mono --debug Sonarr.exe \
-  -nobrowser -data=/config
+    s6-setuidgid abc mono --debug Sonarr.exe \
+    -nobrowser -data=/config