Merge pull request #29 from linuxserver/use_buildstage

bump qbittorrent version, use buildstage

Dockerfile

@@ -1,22 +1,9 @@
-FROM lsiobase/alpine:3.7
+FROM lsiobase/alpine:3.8 as buildstage
-
+############## build stage ##############
-# 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="4.0.2"
+ARG QBITTORRENT_VER="4.1.3"
-ARG RASTERBAR_VER="1.1.5"
+ARG RASTERBAR_VER="1.1.9"
-
-# environment settings
-ENV HOME="/config" \
-XDG_CONFIG_HOME="/config" \
-XDG_DATA_HOME="/config"
-
-# copy patches
-COPY patches/ /tmp/patches
 
 RUN \
  echo "**** install build packages ****" && \
@@ -32,15 +19,9 @@ RUN \
 	git \
 	libtool \
 	make \
-	qt5-qttools-dev && \
+	qt5-qttools-dev
- echo "**** install runtime packages ****" && \
+
- apk add --no-cache \
+RUN \
-	boost-system \
-	boost-thread \
-	ca-certificates \
-	geoip \
-	qt5-qtbase \
-	unrar && \
  echo "**** compile libtorrent rasterbar ****" && \
  git clone https://github.com/arvidn/libtorrent.git /tmp/libtorrent && \
  cd /tmp/libtorrent && \
@@ -51,23 +32,15 @@ RUN \
 	--disable-debug \
 	--enable-encryption \
 	--prefix=/usr && \
- echo "**** attempt to set number of cores available for make to use ****" && \
+ make && \
- set -ex && \
+ make DESTDIR=/tmp/rasterbar-build install && \
- CPU_CORES=$( < /proc/cpuinfo grep -c processor ) || echo "failed cpu look up" && \
- if echo $CPU_CORES | grep -E  -q '^[0-9]+$'; then \
-	: ;\
- if [ "$CPU_CORES" -gt 7 ]; then \
-	CPU_CORES=$(( CPU_CORES  - 3 )); \
- elif [ "$CPU_CORES" -gt 5 ]; then \
-	CPU_CORES=$(( CPU_CORES  - 2 )); \
- elif [ "$CPU_CORES" -gt 3 ]; then \
-	CPU_CORES=$(( CPU_CORES  - 1 )); fi \
- else CPU_CORES="1"; fi && \
- make -j $CPU_CORES && \
- make install && \
  strip --strip-unneeded \
-	/usr/lib/libtorrent-rasterbar.so* \
+	/tmp/rasterbar-build/usr/lib/libtorrent-rasterbar.so* \
-	/usr/lib/libtorrent-rasterbar.a* && \
+	/tmp/rasterbar-build/usr/lib/libtorrent-rasterbar.a* && \
+ echo "**** copy rasterbar build to /usr for qbittorrent dependency ****" && \
+ cp -pr /tmp/rasterbar-build/usr/* /usr/
+
+RUN \
  echo "**** compile qbittorrent ****" && \
  mkdir -p \
 	/tmp/qbittorrent-src && \
@@ -77,22 +50,41 @@ RUN \
  tar xf \
  /tmp/bittorrent.tar.gz -C \
 	/tmp/qbittorrent-src --strip-components=1 && \
- cd /tmp/qbittorrent-src/src/app && \
- patch -i /tmp/patches/main.patch && \
  cd /tmp/qbittorrent-src && \
  ./configure \
 	--disable-gui \
 	--prefix=/usr && \
- make -j $CPU_CORES && \
+ make && \
- set +ex && \
+ make INSTALL_ROOT=/tmp/qbittorrent-build install
- make install && \
- echo "**** cleanup ****" && \
- apk del --purge \
-	build-dependencies && \
- rm -rf \
-	/tmp/*
 
-# add local files
+############## runtime stage ##############
+
+FROM lsiobase/alpine:3.8
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
+LABEL maintainer="sparklyballs"
+
+# environment settings
+ENV HOME="/config" \
+XDG_CONFIG_HOME="/config" \
+XDG_DATA_HOME="/config"
+
+RUN \
+ echo "**** install runtime packages ****" && \
+ apk add --no-cache \
+	boost-system \
+	boost-thread \
+	ca-certificates \
+	geoip \
+	qt5-qtbase \
+	unrar
+
+# copy files from build stage and local files
+COPY --from=buildstage /tmp/qbittorrent-build/usr/ /usr/
+COPY --from=buildstage /tmp/rasterbar-build/usr/ /usr/
 COPY root/ /
 
 # ports and volumes

README.md

@@ -66,6 +66,16 @@ For example,  to set the port to 8090 you need to set `-p 8090:8090` and `-e WEB
 
 This should alleviate the "white screen" issue.
 
+If you have no webui , check the file /config/qBittorrent/qBittorrent.conf
+
+edit or add the following lines
+
+```
+WebUI\Address=*
+
+WebUI\ServerDomains=*
+```
+
 ### 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" ™.
@@ -100,6 +110,13 @@ To monitor the logs of the container in realtime: `docker logs -f qbittorrent`
 
 ## Versions
 
++ **25.09.18:** Use buildstage type build, bump qbitorrent to 4.1.3.
++ **14.08.18:** Rebase to alpine 3.8, bump libtorrent to 1.1.9 and qbitorrent to 4.1.2.
++ **08.06.18:** Bump qbitorrent to 4.1.1.
++ **26.04.18:** Bump libtorrent to 1.1.7.
++ **02.03.18:** Bump qbitorrent to 4.0.4 and libtorrent to 1.1.6.
++ **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.

patches/main.patch

@@ -1,14 +0,0 @@
---- src/app/main.cpp
-+++ src/app/main.cpp
-@@ -59,8 +59,9 @@
-
- #ifdef Q_OS_UNIX
- #include <signal.h>
--#include <execinfo.h>
--#include "stacktrace.h"
-+static inline void print_stacktrace(FILE *out = stderr, unsigned int max_frames = 63) {
-+    fprintf(out, "stack trace:\n N/A (%d)", max_frames);
-+}
- #endif // Q_OS_UNIX
-
- #ifdef STACKTRACE_WIN

root/defaults/qBittorrent.conf

@@ -11,3 +11,5 @@ Connection\PortRangeMin=6881
 Downloads\SavePath=/downloads/
 Downloads\ScanDirsV2=@Variant(\0\0\0\x1c\0\0\0\0)
 Downloads\TempPath=/downloads/incomplete/
+WebUI\Address=*
+WebUI\ServerDomains=*