Compare commits

..

4 Commits

Author SHA1 Message Date
LinuxServer-CI
99a467941c Bot Updating Package Versions 2021-01-20 17:25:55 +00:00
aptalca
5d92065c83 Merge pull request #96 from linuxserver/unstable-deprecate-umask_set
Deprecate UMASK_SET in favor of UMASK in baseimage
2021-01-20 12:19:07 -05:00
Roxedus
6f588431b6 Remove sneaky readme variable 2021-01-20 17:54:56 +01:00
Roxedus
dfb1560271 Deprecate UMASK_SET in favor of UMASK in baseimage 2021-01-20 13:21:57 +01:00
4 changed files with 9 additions and 9 deletions

View File

@@ -84,7 +84,6 @@ services:
- PUID=1000 - PUID=1000
- PGID=1000 - PGID=1000
- TZ=Europe/London - TZ=Europe/London
- UMASK_SET=022
- WEBUI_PORT=8080 - WEBUI_PORT=8080
volumes: volumes:
- </path/to/appdata/config>:/config - </path/to/appdata/config>:/config
@@ -104,7 +103,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 \
-e WEBUI_PORT=8080 \ -e WEBUI_PORT=8080 \
-p 6881:6881 \ -p 6881:6881 \
-p 6881:6881/udp \ -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 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 qbittorrent, optional , default if left unset is 022 |
| `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation | | `-e WEBUI_PORT=8080` | for changing the port of the webui, see below for explanation |
| `-v /config` | Contains all relevant configuration files. | | `-v /config` | Contains all relevant configuration files. |
| `-v /downloads` | Location of downloads on disk. | | `-v /downloads` | Location of downloads on disk. |
@@ -262,6 +259,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.
* **05.07.20:** - Shift to Python3 * **05.07.20:** - Shift to Python3
* **31.10.19:** - Adding unstable tag. * **31.10.19:** - Adding unstable tag.
* **02.08.19:** - Add qbitorrent-cli for processing scripts. * **02.08.19:** - Add qbitorrent-cli for processing scripts.

View File

@@ -131,11 +131,11 @@ libss21.44.1-1ubuntu1.3
libssl1.0.01.0.2n-1ubuntu5.5 libssl1.0.01.0.2n-1ubuntu5.5
libssl1.11.1.1-1ubuntu2.1~18.04.7 libssl1.11.1.1-1ubuntu2.1~18.04.7
libstdc++68.4.0-1ubuntu1~18.04 libstdc++68.4.0-1ubuntu1~18.04
libsystemd0237-3ubuntu10.43 libsystemd0237-3ubuntu10.44
libtasn1-64.13-2 libtasn1-64.13-2
libtinfo56.1-1ubuntu1.18.04 libtinfo56.1-1ubuntu1.18.04
libtorrent-rasterbar101.2.12+git20210104.bfafd20428-1ppa1~18.04 libtorrent-rasterbar101.2.12+git20210118.3efdb8a941-1ppa1~18.04
libudev1237-3ubuntu10.43 libudev1237-3ubuntu10.44
libunistring20.9.9-0ubuntu2 libunistring20.9.9-0ubuntu2
libuuid12.31.1-0.4ubuntu3.7 libuuid12.31.1-0.4ubuntu3.7
libwind0-heimdal7.5.0+dfsg-1 libwind0-heimdal7.5.0+dfsg-1

View File

@@ -34,7 +34,6 @@ param_ports:
param_usage_include_env: true 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"}
- { 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"} - { env_var: "WEBUI_PORT", env_value: "8080", desc: "for changing the port of the webui, see below for explanation"}
# optional parameters # optional parameters
@@ -69,6 +68,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: "05.07.20:", desc: "Shift to Python3" } - { date: "05.07.20:", desc: "Shift to Python3" }
- { date: "31.10.19:", desc: "Adding unstable tag." } - { date: "31.10.19:", desc: "Adding unstable tag." }
- { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." } - { date: "02.08.19:", desc: "Add qbitorrent-cli for processing scripts." }

View File

@@ -1,9 +1,11 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
UMASK_SET=${UMASK_SET:-022}
WEBUI_PORT=${WEBUI_PORT:-8080} 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 \ exec \
s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"