Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f09f155753 | ||
|
|
1c7351b7c0 | ||
|
|
2359b3b2f2 | ||
|
|
f6d230b542 | ||
|
|
bf7c1a5fd4 | ||
|
|
18eadcefdb | ||
|
|
07e75f2949 | ||
|
|
3c3ae9cab1 | ||
|
|
c5579f753b | ||
|
|
9c178a4fdf | ||
|
|
6b61bdc9d9 | ||
|
|
4929d34e2f | ||
|
|
9c8ffeb5ba | ||
|
|
bf017d1624 | ||
|
|
35b6e2315e | ||
|
|
1c4d1c4d6a | ||
|
|
ed55418fc2 | ||
|
|
f8219eae32 | ||
|
|
917f7421e9 | ||
|
|
55f0728496 | ||
|
|
fef8110e7c |
28
Dockerfile
28
Dockerfile
@@ -1,14 +1,14 @@
|
|||||||
FROM lsiobase/alpine:3.6
|
FROM lsiobase/alpine:3.7
|
||||||
MAINTAINER sparklyballs
|
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||||
|
LABEL maintainer="sparklyballs"
|
||||||
|
|
||||||
# package versions
|
# package versions
|
||||||
ARG QBITTORRENT_VER="3.3.14"
|
ARG QBITTORRENT_VER="4.0.4"
|
||||||
ARG RASTERBAR_VER="RC_1_0"
|
ARG RASTERBAR_VER="1.1.6"
|
||||||
|
|
||||||
# environment settings
|
# environment settings
|
||||||
ENV HOME="/config" \
|
ENV HOME="/config" \
|
||||||
@@ -18,8 +18,8 @@ XDG_DATA_HOME="/config"
|
|||||||
# copy patches
|
# copy patches
|
||||||
COPY patches/ /tmp/patches
|
COPY patches/ /tmp/patches
|
||||||
|
|
||||||
# install build packages
|
|
||||||
RUN \
|
RUN \
|
||||||
|
echo "**** install build packages ****" && \
|
||||||
apk add --no-cache --virtual=build-dependencies \
|
apk add --no-cache --virtual=build-dependencies \
|
||||||
autoconf \
|
autoconf \
|
||||||
automake \
|
automake \
|
||||||
@@ -33,8 +33,7 @@ RUN \
|
|||||||
libtool \
|
libtool \
|
||||||
make \
|
make \
|
||||||
qt5-qttools-dev && \
|
qt5-qttools-dev && \
|
||||||
|
echo "**** install runtime packages ****" && \
|
||||||
# install runtime packages
|
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
boost-system \
|
boost-system \
|
||||||
boost-thread \
|
boost-thread \
|
||||||
@@ -42,24 +41,22 @@ RUN \
|
|||||||
geoip \
|
geoip \
|
||||||
qt5-qtbase \
|
qt5-qtbase \
|
||||||
unrar && \
|
unrar && \
|
||||||
|
echo "**** compile libtorrent rasterbar ****" && \
|
||||||
# compile libtorrent rasterbar
|
|
||||||
git clone https://github.com/arvidn/libtorrent.git /tmp/libtorrent && \
|
git clone https://github.com/arvidn/libtorrent.git /tmp/libtorrent && \
|
||||||
cd /tmp/libtorrent && \
|
cd /tmp/libtorrent && \
|
||||||
git checkout ${RASTERBAR_VER} && \
|
RASTERBAR_REALVER=${RASTERBAR_VER//./_} && \
|
||||||
|
git checkout "libtorrent-${RASTERBAR_REALVER}" && \
|
||||||
./autotool.sh && \
|
./autotool.sh && \
|
||||||
./configure \
|
./configure \
|
||||||
--disable-debug \
|
--disable-debug \
|
||||||
--enable-encryption \
|
--enable-encryption \
|
||||||
--prefix=/usr \
|
--prefix=/usr && \
|
||||||
--with-libgeoip=system && \
|
|
||||||
make && \
|
make && \
|
||||||
make install && \
|
make install && \
|
||||||
strip --strip-unneeded \
|
strip --strip-unneeded \
|
||||||
/usr/lib/libtorrent-rasterbar.so* \
|
/usr/lib/libtorrent-rasterbar.so* \
|
||||||
/usr/lib/libtorrent-rasterbar.a* && \
|
/usr/lib/libtorrent-rasterbar.a* && \
|
||||||
|
echo "**** compile qbittorrent ****" && \
|
||||||
# compile qbittorrent
|
|
||||||
mkdir -p \
|
mkdir -p \
|
||||||
/tmp/qbittorrent-src && \
|
/tmp/qbittorrent-src && \
|
||||||
curl -o \
|
curl -o \
|
||||||
@@ -76,8 +73,7 @@ RUN \
|
|||||||
--prefix=/usr && \
|
--prefix=/usr && \
|
||||||
make && \
|
make && \
|
||||||
make install && \
|
make install && \
|
||||||
|
echo "**** cleanup ****" && \
|
||||||
# cleanup
|
|
||||||
apk del --purge \
|
apk del --purge \
|
||||||
build-dependencies && \
|
build-dependencies && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
|
|||||||
19
README.md
19
README.md
@@ -29,6 +29,7 @@ docker create \
|
|||||||
-v <path to downloads>:/downloads \
|
-v <path to downloads>:/downloads \
|
||||||
-e PGID=<gid> -e PUID=<uid> \
|
-e PGID=<gid> -e PUID=<uid> \
|
||||||
-e UMASK_SET=<022> \
|
-e UMASK_SET=<022> \
|
||||||
|
-e WEBUI_PORT=<8080> \
|
||||||
-e TZ=<timezone> \
|
-e TZ=<timezone> \
|
||||||
-p 6881:6881 \
|
-p 6881:6881 \
|
||||||
-p 6881:6881/udp \
|
-p 6881:6881/udp \
|
||||||
@@ -46,16 +47,25 @@ http://192.168.x.x:8080 would show you what's running INSIDE the container on po
|
|||||||
|
|
||||||
* `-p 6881` - the port(s)
|
* `-p 6881` - the port(s)
|
||||||
* `-p 6881/udp` - the port(s)
|
* `-p 6881/udp` - the port(s)
|
||||||
* `-p 8080` - the port(s)
|
* `-p 8080` - webui port
|
||||||
* `-v /config` - where qbittorrent should store its config files
|
* `-v /config` - where qbittorrent should store its config files
|
||||||
* `-v /downloads` - path to downloads
|
* `-v /downloads` - path to downloads
|
||||||
* `-e PGID` for GroupID - see below for explanation
|
* `-e PGID` for GroupID - see below for explanation
|
||||||
* `-e PUID` for UserID - see below for explanation
|
* `-e PUID` for UserID - see below for explanation
|
||||||
* `-e UMASK_SET` for umask setting of qbittorrent, *optional* , default if left unset is 022.
|
* `-e UMASK_SET` for umask setting of qbittorrent, *optional* , default if left unset is 022.
|
||||||
|
* `-e WEBUI_PORT` for changing the port of the webui, see below for explanation
|
||||||
* `-e TZ` for timezone information, eg Europe/London
|
* `-e TZ` for timezone information, eg Europe/London
|
||||||
|
|
||||||
It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it qbittorrent /bin/bash`.
|
It is based on alpine linux with s6 overlay, for shell access whilst the container is running do `docker exec -it qbittorrent /bin/bash`.
|
||||||
|
|
||||||
|
## WEBUI_PORT variable
|
||||||
|
|
||||||
|
Due to issues with CSRF and port mapping, should you require to alter the port for the webui you need to change both sides of the `-p 8080` switch **AND** set the `WEBUI_PORT` variable to the new port.
|
||||||
|
|
||||||
|
For example, to set the port to 8090 you need to set `-p 8090:8090` and `-e WEBUI_PORT=8090`
|
||||||
|
|
||||||
|
This should alleviate the "white screen" issue.
|
||||||
|
|
||||||
### User / Group Identifiers
|
### 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" ™.
|
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" ™.
|
||||||
@@ -90,4 +100,11 @@ To monitor the logs of the container in realtime: `docker logs -f qbittorrent`
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
+ **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.
|
||||||
|
+ **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.
|
+ **01.08.17:** Initial Release.
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
#!/usr/bin/with-contenv bash
|
#!/usr/bin/with-contenv bash
|
||||||
|
|
||||||
UMASK_SET=${UMASK_SET:-022}
|
UMASK_SET=${UMASK_SET:-022}
|
||||||
|
WEBUI_PORT=${WEBUI_PORT:-8080}
|
||||||
|
|
||||||
umask "$UMASK_SET"
|
umask "$UMASK_SET"
|
||||||
|
|
||||||
exec \
|
exec \
|
||||||
s6-setuidgid abc /usr/bin/qbittorrent-nox
|
s6-setuidgid abc /usr/bin/qbittorrent-nox --webui-port="${WEBUI_PORT}"
|
||||||
|
|||||||
Reference in New Issue
Block a user