Merge pull request #14 from linuxserver/3.7

bump to alpine 3.7 and fix continuation lines

Dockerfile

@@ -1,14 +1,14 @@
-FROM lsiobase/alpine:3.6
-MAINTAINER sparklyballs
+FROM lsiobase/alpine:3.7
 
 # 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.16"
-ARG RASTERBAR_VER="RC_1_0"
+ARG QBITTORRENT_VER="4.0.2"
+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 && \
-
-# install runtime packages
+ echo "**** install runtime packages ****" && \
  apk add --no-cache \
 	boost-system \
 	boost-thread \
@@ -42,24 +41,34 @@ RUN \
 	geoip \
 	qt5-qtbase \
 	unrar && \
-
-# compile libtorrent rasterbar
+ echo "**** 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 \
-	--with-libgeoip=system && \
- make && \
+	--prefix=/usr && \
+ echo "**** attempt to set number of cores available for make to use ****" && \
+ set -ex && \
+ 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* \
 	/usr/lib/libtorrent-rasterbar.a* && \
-
-# compile qbittorrent
+ echo "**** compile qbittorrent ****" && \
  mkdir -p \
 	/tmp/qbittorrent-src && \
  curl -o \
@@ -74,10 +83,10 @@ RUN \
  ./configure \
 	--disable-gui \
 	--prefix=/usr && \
- make && \
+ make -j $CPU_CORES && \
+ set +ex && \
  make install && \
-
-# cleanup
+ echo "**** cleanup ****" && \
  apk del --purge \
 	build-dependencies && \
  rm -rf \

README.md

@@ -100,5 +100,8 @@ To monitor the logs of the container in realtime: `docker logs -f qbittorrent`
 
 ## Versions
 
++ **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.