From 04c10ca646654b7409bc0117086464a4e76e112e Mon Sep 17 00:00:00 2001
From: Roxedus <me@roxedus.dev>
Date: Sat, 23 Jan 2021 13:46:54 +0100
Subject: [PATCH] Deprecate UMASK_SET in favor of UMASK in baseimage

---
 README.md                      | 4 +---
 readme-vars.yml                | 5 ++---
 root/etc/services.d/bazarr/run | 6 ++++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 024e106..e92fe25 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,6 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/London
-      - UMASK_SET=022 #optional
     volumes:
       - </path/to/bazarr/config>:/config
       - </path/to/movies>:/movies
@@ -94,7 +93,6 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Europe/London \
-  -e UMASK_SET=022 `#optional` \
   -p 6767:6767 \
   -v </path/to/bazarr/config>:/config \
   -v </path/to/movies>:/movies \
@@ -119,7 +117,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` | control permissions of files and directories created by Bazarr |
 | `-v /config` | Bazarr data |
 | `-v /movies` | Location of your movies |
 | `-v /tv` | Location of your TV Shows |
@@ -233,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **19.12.19:** - Rebasing to alpine 3.12.
 * **13.05.20:** - Add donation links for Bazarr to container log.
 * **08.04.20:** - Removed /movies and /tv volumes from Dockerfiles.
diff --git a/readme-vars.yml b/readme-vars.yml
index 518ee89..ac43689 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -36,9 +36,7 @@ param_usage_include_env: true
 param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
 # optional env variables
-opt_param_usage_include_env: true
-opt_param_env_vars:
-  - { env_var: "UMASK_SET", env_value: "022", desc: "control permissions of files and directories created by Bazarr"}
+opt_param_usage_include_env: false
 
 # application setup block
 app_setup_block_enabled: true
@@ -48,6 +46,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "23.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
   - { date: "19.12.19:", desc: "Rebasing to alpine 3.12." }
   - { date: "13.05.20:", desc: "Add donation links for Bazarr to container log." }
   - { date: "08.04.20:", desc: "Removed /movies and /tv volumes from Dockerfiles." }
diff --git a/root/etc/services.d/bazarr/run b/root/etc/services.d/bazarr/run
index 7057794..36c6402 100644
--- a/root/etc/services.d/bazarr/run
+++ b/root/etc/services.d/bazarr/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 python3 /app/bazarr/bazarr.py \