Merge pull request #29 from linuxserver/use_buildstage

bump qbittorrent version, use buildstage

Dockerfile

@@ -1,20 +1,10 @@
-FROM lsiobase/alpine:3.8
+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.1.2"
+ARG QBITTORRENT_VER="4.1.3"
 ARG RASTERBAR_VER="1.1.9"
 
-# environment settings
-ENV HOME="/config" \
-XDG_CONFIG_HOME="/config" \
-XDG_DATA_HOME="/config"
-
 RUN \
  echo "**** install build packages ****" && \
  apk add --no-cache --virtual=build-dependencies \
@@ -29,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 && \
@@ -49,10 +33,14 @@ RUN \
 	--enable-encryption \
 	--prefix=/usr && \
  make && \
- make install && \
+ make DESTDIR=/tmp/rasterbar-build 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 && \
@@ -67,14 +55,36 @@ RUN \
 	--disable-gui \
 	--prefix=/usr && \
  make && \
- make install && \
+ make INSTALL_ROOT=/tmp/qbittorrent-build 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

@@ -110,6 +110,7 @@ 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.

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