From dfb15602714882e00e098f9ec81823ac1d335085 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Wed, 20 Jan 2021 13:21:57 +0100 Subject: [PATCH 1/2] Deprecate UMASK_SET in favor of UMASK in baseimage --- README.md | 1 + readme-vars.yml | 1 + root/etc/services.d/qbittorrent/run | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3192971..ee2fa31 100644 --- a/README.md +++ b/README.md @@ -262,6 +262,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.07.20:** - Shift to Python3 * **31.10.19:** - Adding unstable tag. * **02.08.19:** - Add qbitorrent-cli for processing scripts. diff --git a/readme-vars.yml b/readme-vars.yml index 20cfb8b..72352d5 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -69,6 +69,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.07.20:", desc: "Shift to Python3" } - { date: "31.10.19:", desc: "Adding unstable tag." } - { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." } diff --git a/root/etc/services.d/qbittorrent/run b/root/etc/services.d/qbittorrent/run index 97ac260..022839f 100644 --- a/root/etc/services.d/qbittorrent/run +++ b/root/etc/services.d/qbittorrent/run @@ -1,9 +1,11 @@ #!/usr/bin/with-contenv bash -UMASK_SET=${UMASK_SET:-022} WEBUI_PORT=${WEBUI_PORT:-8080} -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 /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" From 6f588431b6ccc3f783e979290473ec1af513e01f Mon Sep 17 00:00:00 2001 From: Roxedus Date: Wed, 20 Jan 2021 17:54:56 +0100 Subject: [PATCH 2/2] Remove sneaky readme variable --- README.md | 5 +---- readme-vars.yml | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ee2fa31..4d5a1b7 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,6 @@ services: - PUID=1000 - PGID=1000 - TZ=Europe/London - - UMASK_SET=022 - WEBUI_PORT=8080 volumes: - :/config @@ -104,7 +103,6 @@ docker run -d \ -e PUID=1000 \ -e PGID=1000 \ -e TZ=Europe/London \ - -e UMASK_SET=022 \ -e WEBUI_PORT=8080 \ -p 6881:6881 \ -p 6881:6881/udp \ @@ -128,7 +126,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 qbittorrent, optional , default if left unset is 022 | | `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation | | `-v /config` | Contains all relevant configuration files. | | `-v /downloads` | Location of downloads on disk. | @@ -262,7 +259,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. +* **20.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information. * **05.07.20:** - Shift to Python3 * **31.10.19:** - Adding unstable tag. * **02.08.19:** - Add qbitorrent-cli for processing scripts. diff --git a/readme-vars.yml b/readme-vars.yml index 72352d5..c33bf10 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -34,7 +34,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 qbittorrent, optional , default if left unset is 022"} - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the webui, see below for explanation"} # optional parameters @@ -69,7 +68,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: "20.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." } - { date: "05.07.20:", desc: "Shift to Python3" } - { date: "31.10.19:", desc: "Adding unstable tag." } - { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." }