Deprecate UMASK_SET in favor of UMASK in baseimage

README.md

@@ -85,7 +85,6 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Europe/London
-      - UMASK_SET=<022> #optional
     volumes:
       - /path/to/library:/config
       - path/to/tvseries:/data/tvshows
@@ -112,7 +111,6 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Europe/London \
-  -e UMASK_SET=<022> `#optional` \
   -p 8096:8096 \
   -p 8920:8920 `#optional` \
   -v /path/to/library:/config \
@@ -141,7 +139,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 Emby, default if left unset is 022. |
 | `-v /config` | Jellyfin data storage location. *This can grow very large, 50gb+ is likely for a large collection.* |
 | `-v /data/tvshows` | Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc. |
 | `-v /data/movies` | Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc. |
@@ -300,6 +297,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.01.21:"** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
 * **05.01.21:** - Add nvidia.icd file to fix missing tonemapping using Nvidia HW.
 * **23.11.20:** - Rebase to Focal, branch off Bionic.
 * **22.07.20:** - Install nightly from unstable.

readme-vars.yml

@@ -35,9 +35,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 container parameters
-opt_param_usage_include_env: true
+opt_param_usage_include_env: false
-opt_param_env_vars:
-  - { env_var: "UMASK_SET", env_value: "<022>", desc: "for umask setting of Emby, default if left unset is 022."}
 opt_param_usage_include_vols: true
 opt_param_volumes:
   - { vol_path: "/opt/vc/lib", vol_host_path: "/opt/vc/lib", desc: "Path for Raspberry Pi OpenMAX libs *optional*." }
@@ -62,25 +60,25 @@ app_setup_block: |
   More information can be found in their official documentation [here](https://jellyfin.org/docs/general/quick-start.html) .
 
   ## Hardware Acceleration
-  
+
   ### Intel
-  
+
   Hardware acceleration users for Intel Quicksync will need to mount their /dev/dri video device inside of the container by passing the following command when running or creating the container:
 
   ```--device=/dev/dri:/dev/dri```
 
   We will automatically ensure the abc user inside of the container has the proper permissions to access this device.
-  
+
   ### Nvidia
-  
+
   Hardware acceleration users for Nvidia will need to install the container runtime provided by Nvidia on their host, instructions can be found here:
 
   https://github.com/NVIDIA/nvidia-docker
 
   We automatically add the necessary environment variable that will utilise all the features available on a GPU on the host. Once nvidia-docker is installed on your host you will need to re/create the docker container with the nvidia container runtime `--runtime=nvidia` and add an environment variable `-e NVIDIA_VISIBLE_DEVICES=all` (can also be set to a specific gpu's UUID, this can be discovered by running `nvidia-smi --query-gpu=gpu_name,gpu_uuid --format=csv` ). NVIDIA automatically mounts the GPU and drivers from your host into the jellyfin docker container.
-  
+
   ### MMAL/OpenMAX (Raspberry Pi)
-  
+
   Hardware acceleration users for Raspberry Pi MMAL/OpenMAX will need to mount their `/dev/vc-mem` and `/dev/vchiq` video devices inside of the container and their system OpenMax libs by passing the following options when running or creating the container:
 
   ```
@@ -90,7 +88,7 @@ app_setup_block: |
   ```
 
   ### V4L2 (Raspberry Pi)
-  
+
   Hardware acceleration users for Raspberry Pi V4L2 will need to mount their `/dev/video1X` devices inside of the container by passing the following options when running or creating the container:
   ```
   --device=/dev/video10:/dev/video10
@@ -100,6 +98,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: 20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
   - { date: "05.01.21:", desc: "Add nvidia.icd file to fix missing tonemapping using Nvidia HW." }
   - { date: "23.11.20:", desc: "Rebase to Focal, branch off Bionic." }
   - { date: "22.07.20:", desc: "Install nightly from unstable." }

root/etc/services.d/jellyfin/run

@@ -6,9 +6,10 @@ JELLYFIN_LOG_DIR="/config/log" \
 JELLYFIN_CACHE_DIR="/config/cache" \
 JELLYFIN_WEB_DIR="/usr/share/jellyfin/web"
 
-# set umask
+if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
-UMASK_SET=${UMASK_SET:-022}
+  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"
+  umask ${UMASK_SET}
+fi
 
 exec \
 	s6-setuidgid abc /usr/bin/jellyfin \