From fef8110e7cae449a65a38ad9fe85b7be95ca64c3 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sat, 16 Sep 2017 08:07:40 +0100 Subject: [PATCH 1/6] bump version and add WEBUI_PORT variable to allow changing of the webui port --- Dockerfile | 2 +- README.md | 8 +++++++- root/etc/services.d/qbittorrent/run | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f49b2ea..e3e51e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG VERSION LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" # package versions -ARG QBITTORRENT_VER="3.3.14" +ARG QBITTORRENT_VER="3.3.16" ARG RASTERBAR_VER="RC_1_0" # environment settings diff --git a/README.md b/README.md index 488488f..79de6c9 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ docker create \ -v :/downloads \ -e PGID= -e PUID= \ -e UMASK_SET=<022> \ + -e WEBUI_PORT=<8080> \ -e TZ= \ -p 6881:6881 \ -p 6881:6881/udp \ @@ -46,12 +47,13 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po * `-p 6881` - the port(s) * `-p 6881/udp` - the port(s) -* `-p 8080` - the port(s) +* `-p 8080` - webui port * `-v /config` - where qbittorrent should store its config files * `-v /downloads` - path to downloads * `-e PGID` for GroupID - see below for explanation * `-e PUID` for UserID - see below for explanation * `-e UMASK_SET` for umask setting of qbittorrent, *optional* , default if left unset is 022. +* `-e WEBUI_PORT` for changing the port of the webui, see below for explanation * `-e TZ` for timezone information, eg Europe/London It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it qbittorrent /bin/bash`. @@ -71,6 +73,9 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel The webui is at `:8080` and the default username/password is `admin/adminadmin`. +Due to issues with CSRF and port mapping, to change the port for the webui you need to change both sides of the `-p 8080` switch +AND set the `WEBUI_PORT` variable to the new port, this should alleviate the "white screen" issue. + Change username/password via the webui in the webui section of settings. @@ -90,4 +95,5 @@ To monitor the logs of the container in realtime: `docker logs -f qbittorrent` ## Versions ++ **16.09.17:** Bump to 3.3.16, Add WEBUI_PORT variable and notes to README to allow changing port of webui. + **01.08.17:** Initial Release. diff --git a/root/etc/services.d/qbittorrent/run b/root/etc/services.d/qbittorrent/run index 8162d80..97ac260 100644 --- a/root/etc/services.d/qbittorrent/run +++ b/root/etc/services.d/qbittorrent/run @@ -1,8 +1,9 @@ #!/usr/bin/with-contenv bash UMASK_SET=${UMASK_SET:-022} +WEBUI_PORT=${WEBUI_PORT:-8080} umask "$UMASK_SET" exec \ - s6-setuidgid abc /usr/bin/qbittorrent-nox + s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}" From 55f0728496df4803ad81894852cf65d3049d3336 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sat, 16 Sep 2017 08:17:14 +0100 Subject: [PATCH 2/6] refine WEBUI_PORT blurb --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 79de6c9..1385a26 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,12 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it qbittorrent /bin/bash`. +## WEBUI_PORT variable + +Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the `-p 8080` switch +AND set the `WEBUI_PORT` variable to the new port, this should alleviate the "white screen" issue. +For example, to set the port to 8090 you need to set `-p 8090:8090` and `-e WEBUI_PORT=8090` + ### User / Group Identifiers Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™. @@ -73,9 +79,6 @@ In this instance `PUID=1001` and `PGID=1001`. To find yours use `id user` as bel The webui is at `:8080` and the default username/password is `admin/adminadmin`. -Due to issues with CSRF and port mapping, to change the port for the webui you need to change both sides of the `-p 8080` switch -AND set the `WEBUI_PORT` variable to the new port, this should alleviate the "white screen" issue. - Change username/password via the webui in the webui section of settings. From 917f7421e97e50ab9ae856d2a8f39da0f1f4480d Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sat, 16 Sep 2017 08:18:05 +0100 Subject: [PATCH 3/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1385a26..8997a7a 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it qbittorrent /bin/bash`. -## WEBUI_PORT variable +### WEBUI_PORT variable Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the `-p 8080` switch AND set the `WEBUI_PORT` variable to the new port, this should alleviate the "white screen" issue. From f8219eae32e94d10ed715b0163bb70ab662296e8 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sat, 16 Sep 2017 08:19:25 +0100 Subject: [PATCH 4/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8997a7a..8925495 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it qbittorrent /bin/bash`. -### WEBUI_PORT variable +## WEBUI_PORT variable Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the `-p 8080` switch AND set the `WEBUI_PORT` variable to the new port, this should alleviate the "white screen" issue. From ed55418fc26b9972040e94596fff93bc4ad1c2c0 Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sat, 16 Sep 2017 08:21:00 +0100 Subject: [PATCH 5/6] spacing --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8925495..3d65e0a 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,9 @@ It is based on alpine linux with s6 overlay, for shell access whilst the contain ## WEBUI_PORT variable Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the `-p 8080` switch + AND set the `WEBUI_PORT` variable to the new port, this should alleviate the "white screen" issue. + For example, to set the port to 8090 you need to set `-p 8090:8090` and `-e WEBUI_PORT=8090` ### User / Group Identifiers From 1c4d1c4d6ae14e2050828c9dd740d388ce719a2c Mon Sep 17 00:00:00 2001 From: sparklyballs Date: Sat, 16 Sep 2017 08:24:32 +0100 Subject: [PATCH 6/6] improve blurb again on WEBUI_PORT variable --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3d65e0a..4152241 100644 --- a/README.md +++ b/README.md @@ -60,12 +60,12 @@ It is based on alpine linux with s6 overlay, for shell access whilst the contain ## WEBUI_PORT variable -Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the `-p 8080` switch - -AND set the `WEBUI_PORT` variable to the new port, this should alleviate the "white screen" issue. +Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the `-p 8080` switch **AND** set the `WEBUI_PORT` variable to the new port. For example, to set the port to 8090 you need to set `-p 8090:8090` and `-e WEBUI_PORT=8090` +This should alleviate the "white screen" issue. + ### User / Group Identifiers Sometimes when using data volumes (`-v` flags) permissions issues can arise between the host OS and the container. We avoid this issue by allowing you to specify the user `PUID` and group `PGID`. Ensure the data volume directory on the host is owned by the same user you specify and it will "just work" ™.