Merge pull request #17 from linuxserver/deprecate_cpu_core

deprecate cpu_core routine lack of scaling

Dockerfile

@@ -1,14 +1,14 @@
-FROM lsiobase/alpine:3.6
+FROM lsiobase/alpine:3.7
-MAINTAINER sparklyballs
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs"
 
 # package versions
-ARG QBITTORRENT_VER="3.3.14"
+ARG QBITTORRENT_VER="4.0.3"
-ARG RASTERBAR_VER="RC_1_0"
+ARG RASTERBAR_VER="1.1.5"
 
 # environment settings
 ENV HOME="/config" \
@@ -18,8 +18,8 @@ XDG_DATA_HOME="/config"
 # copy patches
 COPY patches/ /tmp/patches
 
-# install build packages
 RUN \
+ echo "**** install build packages ****" && \
  apk add --no-cache --virtual=build-dependencies \
 	autoconf \
 	automake \
@@ -33,8 +33,7 @@ RUN \
 	libtool \
 	make \
 	qt5-qttools-dev && \
-
+ echo "**** install runtime packages ****" && \
-# install runtime packages
  apk add --no-cache \
 	boost-system \
 	boost-thread \
@@ -42,24 +41,22 @@ RUN \
 	geoip \
 	qt5-qtbase \
 	unrar && \
-
+ echo "**** compile libtorrent rasterbar ****" && \
-# compile libtorrent rasterbar
  git clone https://github.com/arvidn/libtorrent.git /tmp/libtorrent && \
  cd /tmp/libtorrent && \
- git checkout ${RASTERBAR_VER} && \
+ RASTERBAR_REALVER=${RASTERBAR_VER//./_} && \
+ git checkout "libtorrent-${RASTERBAR_REALVER}" && \
  ./autotool.sh && \
  ./configure \
 	--disable-debug \
 	--enable-encryption \
-	--prefix=/usr \
+	--prefix=/usr && \
-	--with-libgeoip=system && \
  make && \
  make install && \
  strip --strip-unneeded \
 	/usr/lib/libtorrent-rasterbar.so* \
 	/usr/lib/libtorrent-rasterbar.a* && \
-
+ echo "**** compile qbittorrent ****" && \
-# compile qbittorrent
  mkdir -p \
 	/tmp/qbittorrent-src && \
  curl -o \
@@ -76,8 +73,7 @@ RUN \
 	--prefix=/usr && \
  make && \
  make install && \
-
+ echo "**** cleanup ****" && \
-# cleanup
  apk del --purge \
 	build-dependencies && \
  rm -rf \

README.md

@@ -29,6 +29,7 @@ docker create \
   -v <path to downloads>:/downloads \
   -e PGID=<gid> -e PUID=<uid>  \
   -e UMASK_SET=<022> \
+  -e WEBUI_PORT=<8080> \
   -e TZ=<timezone> \
   -p 6881:6881 \
   -p 6881:6881/udp \
@@ -46,16 +47,25 @@ 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`.
 
+## 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.
+
+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" ™.
@@ -90,4 +100,10 @@ To monitor the logs of the container in realtime: `docker logs -f qbittorrent`
 
 ## Versions
 
++ **02.01.18:** Deprecate cpu_core routine lack of scaling.
++ **19.12.17:** Update to v4.0.3.
++ **09.12.17:** Rebase to alpine 3.7.
++ **01.12.17:** Update to v4.0.2.
++ **27.11.17:** Update to v4 and use cpu_core routine to speed up builds.
++ **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.

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}"