linuxserver/docker-jellyfin
1
1
Fork 0
mirror of https://github.com/linuxserver/docker-jellyfin.git synced 2025-10-27 03:03:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Deprecate UMASK_SET in favor of UMASK in baseimage
This commit is contained in:
aptalca
2021-01-20 08:02:59 -05:00
committed by GitHub
parent c95a3de23f 54c0c895e1
commit c0e5e02d5f
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -85,7 +85,6 @@ services:
- PUID=1000 - PUID=1000
- PGID=1000 - PGID=1000
- TZ=Europe/London - TZ=Europe/London
- UMASK_SET=<022> #optional
volumes: volumes:
- /path/to/library:/config - /path/to/library:/config
- /path/to/tvseries:/data/tvshows - /path/to/tvseries:/data/tvshows
@@ -114,7 +113,6 @@ docker run -d \
-e PUID=1000 \ -e PUID=1000 \
-e PGID=1000 \ -e PGID=1000 \
-e TZ=Europe/London \ -e TZ=Europe/London \
-e UMASK_SET=<022> `#optional` \
-p 8096:8096 \ -p 8096:8096 \
-p 8920:8920 `#optional` \ -p 8920:8920 `#optional` \
-p 7359:7359/udp `#optional` \ -p 7359:7359/udp `#optional` \
@@ -147,7 +145,6 @@ Container images are configured using parameters passed at runtime (such as thos
| `-e PUID=1000` | for UserID - see below for explanation | | `-e PUID=1000` | for UserID - see below for explanation |
| `-e PGID=1000` | for GroupID - 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 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 /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/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. | | `-v /data/movies` | Media goes here. Add as many as needed e.g. `/data/movies`, `/data/tv`, etc. |
@@ -321,6 +318,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **20.01.21:"** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
* **23.11.20:** - Rebase to Focal, branch off Bionic. * **23.11.20:** - Rebase to Focal, branch off Bionic.
* **22.07.20:** - Ingest releases from Jellyfin repo. * **22.07.20:** - Ingest releases from Jellyfin repo.
* **28.04.20:** - Replace MMAL/OMX dependency device `/dev/vc-mem` with `/dev/vcsm` as the former was not sufficient for raspbian. * **28.04.20:** - Replace MMAL/OMX dependency device `/dev/vc-mem` with `/dev/vcsm` as the former was not sufficient for raspbian.

6
readme-vars.yml
View File

@@ -35,9 +35,8 @@ param_usage_include_env: true
param_env_vars: param_env_vars:
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"} - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
# optional container parameters # 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_usage_include_vols: true
opt_param_volumes: opt_param_volumes:
- { vol_path: "/opt/vc/lib", vol_host_path: "/opt/vc/lib", desc: "Path for Raspberry Pi OpenMAX libs *optional*." } - { vol_path: "/opt/vc/lib", vol_host_path: "/opt/vc/lib", desc: "Path for Raspberry Pi OpenMAX libs *optional*." }
@@ -114,6 +113,7 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: 20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
- { date: "23.11.20:", desc: "Rebase to Focal, branch off Bionic." } - { date: "23.11.20:", desc: "Rebase to Focal, branch off Bionic." }
- { date: "22.07.20:", desc: "Ingest releases from Jellyfin repo." } - { date: "22.07.20:", desc: "Ingest releases from Jellyfin repo." }
- { date: "28.04.20:", desc: "Replace MMAL/OMX dependency device `/dev/vc-mem` with `/dev/vcsm` as the former was not sufficient for raspbian." } - { date: "28.04.20:", desc: "Replace MMAL/OMX dependency device `/dev/vc-mem` with `/dev/vcsm` as the former was not sufficient for raspbian." }

9
root/etc/services.d/jellyfin/run
View File

@@ -3,11 +3,12 @@
export JELLYFIN_DATA_DIR="/config/data" \ export JELLYFIN_DATA_DIR="/config/data" \
JELLYFIN_CONFIG_DIR="/config" \ JELLYFIN_CONFIG_DIR="/config" \
JELLYFIN_LOG_DIR="/config/log" \ JELLYFIN_LOG_DIR="/config/log" \
JELLYFIN_CACHE_DIR="/config/cache" JELLYFIN_CACHE_DIR="/config/cache"
# 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 \ exec \
s6-setuidgid abc /usr/bin/jellyfin \ s6-setuidgid abc /usr/bin/jellyfin \