Compare commits

..

10 Commits
48 ... 77

Author SHA1 Message Date
sparklyballs
489adb5d50 Merge pull request #21 from linuxserver/Bump-version-to-4.1.1
Bump version to 4.1.1
2018-06-08 15:55:14 +01:00
sparklyballs
ab47931546 remove patch 2018-06-02 11:31:44 +01:00
chbmb
64d330d04c Update Dockerfile 2018-06-02 11:06:37 +01:00
sparklyballs
06d53f02f4 Merge pull request #20 from linuxserver/bump_versions
bump libtorrent version
2018-04-26 13:27:47 +01:00
sparklyballs
87b783fd8c bump libtorrent version 2018-04-26 09:39:28 +01:00
sparklyballs
f09f155753 update changelog 2018-03-02 19:49:56 +00:00
sparklyballs
1c7351b7c0 Merge pull request #19 from pl77/4.0.4-Update
Update to qbittorrent 4.0.4 and libtorrent 1.1.6
2018-03-02 19:49:06 +00:00
pl77
2359b3b2f2 Update to qbittorrent 4.0.4 and libtorrent 1.1.6
No change necessary to patch file.
2018-03-02 12:48:44 -05:00
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
2 changed files with 7 additions and 22 deletions

View File

@@ -7,17 +7,14 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="sparklyballs"
# package versions
ARG QBITTORRENT_VER="4.0.3"
ARG RASTERBAR_VER="1.1.5"
ARG QBITTORRENT_VER="4.1.1"
ARG RASTERBAR_VER="1.1.7"
# environment settings
ENV HOME="/config" \
XDG_CONFIG_HOME="/config" \
XDG_DATA_HOME="/config"
# copy patches
COPY patches/ /tmp/patches
RUN \
echo "**** install build packages ****" && \
apk add --no-cache --virtual=build-dependencies \
@@ -51,19 +48,7 @@ RUN \
--disable-debug \
--enable-encryption \
--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 && \
make install && \
strip --strip-unneeded \
/usr/lib/libtorrent-rasterbar.so* \
@@ -77,14 +62,11 @@ 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 && \
set +ex && \
make && \
make install && \
echo "**** cleanup ****" && \
apk del --purge \

View File

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