Merge pull request #56 from linuxserver/master-deprecate-umask_set

Deprecate UMASK_SET in favor of UMASK in baseimage

Author: Roxedus

README.md

@@ -76,7 +76,6 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/London
-      - UMASK_SET=022
     volumes:
       - /path/to/appdata/config:/config
       - /path/to/downloads:/downloads
@@ -94,7 +93,6 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Europe/London \
-  -e UMASK_SET=022 \
   -p 5050:5050 \
   -v /path/to/appdata/config:/config \
   -v /path/to/downloads:/downloads \
@@ -114,7 +112,6 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
-| `-e UMASK_SET=022` | for umask setting of couchpotato, optional , default if left unset is 022 |
 | `-v /config` | Couchpotato Application Data. |
 | `-v /downloads` | Downloads Folder. |
 | `-v /movies` | Movie Share. |
@@ -227,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **29.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **23.01.21:** - Rebasing to alpine 3.13.
 * **10.06.19:** - Add back unrar & unzip that were accidentally left out during rebase.
 * **06.06.19:** - Rebasing to alpine 3.12.

readme-vars.yml

@@ -27,7 +27,6 @@ param_ports:
 param_usage_include_env: true
 param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
-  - { env_var: "UMASK_SET", env_value: "022", desc: "for umask setting of couchpotato, optional , default if left unset is 022"}
 
 # optional parameters
 optional_block_1: false
@@ -40,6 +39,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "29.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
   - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
   - { date: "10.06.19:", desc: "Add back unrar & unzip that were accidentally left out during rebase." }
   - { date: "06.06.19:", desc: "Rebasing to alpine 3.12." }

root/etc/services.d/couchpotato/run

@@ -1,7 +1,9 @@
 #!/usr/bin/with-contenv bash
 
-UMASK_SET=${UMASK_SET:-022}
-umask "$UMASK_SET"
+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
 
 exec \
 	s6-setuidgid abc python /app/couchpotato/CouchPotato.py \