do not override torrenting port unless var is set

This commit is contained in:
aptalca 2024-02-14 14:56:49 -05:00
parent 873a9fab4a
commit c9fef1b8fd
No known key found for this signature in database
GPG key ID: BE36CFFB9FD85548
3 changed files with 8 additions and 4 deletions

View file

@ -311,7 +311,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions ## Versions
* **10.02.24:** - Add torrenting port support. * **14.02.24:** - Only set/override torrenting port if the optional env var is set.
* **14.02.24:** - Add torrenting port support.
* **31.01.24:** - Remove obsolete compat packages. * **31.01.24:** - Remove obsolete compat packages.
* **25.12.23:** - Only pull stable releases of qbittorrent-cli. * **25.12.23:** - Only pull stable releases of qbittorrent-cli.
* **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar). * **07.10.23:** - Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar).

View file

@ -58,7 +58,8 @@ app_setup_block: |
# changelog # changelog
changelogs: changelogs:
- { date: "10.02.24:", desc: "Add torrenting port support." } - { date: "14.02.24:", desc: "Only set/override torrenting port if the optional env var is set." }
- { date: "14.02.24:", desc: "Add torrenting port support." }
- { date: "31.01.24:", desc: "Remove obsolete compat packages."} - { date: "31.01.24:", desc: "Remove obsolete compat packages."}
- { date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."} - { date: "25.12.23:", desc: "Only pull stable releases of qbittorrent-cli."}
- { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."} - { date: "07.10.23:", desc: "Install unrar from [linuxserver repo](https://github.com/linuxserver/docker-unrar)."}

View file

@ -2,8 +2,10 @@
# shellcheck shell=bash # shellcheck shell=bash
WEBUI_PORT=${WEBUI_PORT:-8080} WEBUI_PORT=${WEBUI_PORT:-8080}
TORRENTING_PORT=${TORRENTING_PORT:-6881} if [[ -n "${TORRENTING_PORT}" ]]; then
TORRENTING_PORT_ARG="--torrenting-port=${TORRENTING_PORT}"
fi
exec \ exec \
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \
s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" --torrenting-port="${TORRENTING_PORT}" s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" ${TORRENTING_PORT_ARG}