diff --git a/Dockerfile b/Dockerfile index f853de756d000de83aaeaaf5c068fc9810c3f54e..9dd39afee397bb16da2e46067e0c926aa38c7ea7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,6 +26,7 @@ RUN \ openssl \ p7zip \ unrar \ + libcap \ unzip && \ apk add --no-cache \ --repository http://nl.alpinelinux.org/alpine/edge/testing \ @@ -58,9 +59,9 @@ RUN mkdir /configs COPY configs /configs RUN chmod +x /Entrypoint.sh -#Â ports -EXPOSE 8112 58846 58946 58946/udp +RUN setcap cap_net_bind_service=+ep /usr/bin/python2.7 -ENTRYPOINT /Entrypoint.sh +#Â ports +EXPOSE 80 58846 58946 58946/udp -CMD ["/init"] \ No newline at end of file +ENTRYPOINT /Entrypoint.sh \ No newline at end of file diff --git a/configs/web.conf b/configs/web.conf index eb4d63ef00fb0adfdc60033e453d164ac099e437..44c6d6ade53ccb51168bf98522361ff188c1a9c9 100644 --- a/configs/web.conf +++ b/configs/web.conf @@ -15,5 +15,5 @@ "default_daemon": "127.0.0.1:58846", "sidebar_multiple_filters": true, "pwd_salt": "5588bea86a36353faf34c488a54e81a39a8fab27", - "port": 8112 + "port": 80 } \ No newline at end of file diff --git a/root/Entrypoint.sh b/root/Entrypoint.sh index 47d6051592410e33d8a2c629db64ecab558117c4..d0d0fa8920f0b4bc7675f134b3c281ad13c2889d 100644 --- a/root/Entrypoint.sh +++ b/root/Entrypoint.sh @@ -13,9 +13,11 @@ mkdir -p /torrents/config/watch mv /configs/* /torrents/config/deluge/ rm -fr /configs -chown -R abc:abc /torrents +chown -R 1000:1000 /torrents chmod +x /deluge-pass.py /deluge-pass.py /torrents/config/deluge ${DELUGE_PASSWORD} -exec "/init" +cat /torrents/config/deluge/auth | grep "${DELUGE_USERNAME}" || echo "${DELUGE_USERNAME}:${DELUGE_PASSWORD}:10" >> /torrents/config/deluge/auth + +exec "/init" \ No newline at end of file diff --git a/root/etc/services.d/deluged/run b/root/etc/services.d/deluged/run index 0469502b20c4aa794976ce77da67c02296c5bb09..dc611e444a038f0cffd37cb27dad1e32cec4282d 100644 --- a/root/etc/services.d/deluged/run +++ b/root/etc/services.d/deluged/run @@ -4,6 +4,9 @@ UMASK_SET=${UMASK_SET:-022} umask "$UMASK_SET" +s6-setuidgid abc /usr/bin/deluged -c /torrents/config/deluge/ -d --loglevel=info -l /torrents/config/log/deluged.log & +echo $(date) && sleep 10 && echo $(date) && kill -9 $(pgrep -f '/usr/bin/deluged') + exec \ s6-setuidgid abc /usr/bin/deluged -c /torrents/config/deluge/ \ -d --loglevel=info -l /torrents/config/log/deluged.log