Merge pull request #17 from linuxserver/deprecate_cpu_core

deprecate cpu_core routine lack of scaling
2018-01-03 11:25:14 +00:00 · 2018-01-02 21:39:50 +00:00 · 2017-12-19 11:50:58 +00:00 · 2017-12-19 01:11:21 +02:00 · 2017-12-19 01:10:40 +02:00 · 2017-12-17 00:12:39 +00:00
2 changed files with 17 additions and 16 deletions
--- a/28
+++ b/28
@@ -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.3"
+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,22 @@ 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 && \
+	--prefix=/usr && \
 make && \
 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 \
@@ -76,8 +73,7 @@ RUN \
 	--prefix=/usr && \
 make && \
 make install && \
-
-# cleanup
+ echo "**** cleanup ****" && \
 apk del --purge \
 	build-dependencies && \
 rm -rf \
--- a/README.md
+++ b/README.md
@@ -100,5 +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.
Author	SHA1	Message	Date
sparklyballs	f6d230b542	Merge pull request #17 from linuxserver/deprecate_cpu_core deprecate cpu_core routine lack of scaling	2018-01-03 11:25:14 +00:00
sparklyballs	bf7c1a5fd4	deprecate cpu_core routine lack of scaling	2018-01-02 21:39:50 +00:00
sparklyballs	18eadcefdb	Merge pull request #16 from Owkkuri/version_update_4_0_3 Version update 4 0 3	2017-12-19 11:50:58 +00:00
Ross van Wyk	07e75f2949	update docs Add version change to Versions list	2017-12-19 01:11:21 +02:00
Ross van Wyk	3c3ae9cab1	version update Update qbittorrent version to 4.0.3, was 4.0.2	2017-12-19 01:10:40 +02:00
sparklyballs	c5579f753b	Merge pull request #14 from linuxserver/3.7 bump to alpine 3.7 and fix continuation lines	2017-12-17 00:12:39 +00:00
sparklyballs	9c178a4fdf	bump to alpine 3.7 and fix continuation lines	2017-12-09 13:10:44 +00:00
j0nnymoe	6b61bdc9d9	Merge pull request #13 from linuxserver/4.0.2 update to v4.0.2	2017-12-01 20:52:24 +00:00
sparklyballs	4929d34e2f	update to v4.0.2	2017-12-01 19:36:51 +00:00
saarg	9c8ffeb5ba	Merge pull request #12 from linuxserver/v4_update update to v4 and latest rasterbar, use cpu core routine	2017-11-29 12:23:04 +01:00
sparklyballs	bf017d1624	update to v4 and latest rasterbar, use cpu core routine	2017-11-27 17:02:58 +00:00