dave/docker-deluge-vpn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use xenial, longer timeout

Browse Source
This commit is contained in:
dave 2019-11-24 22:46:37 -08:00
parent 0e2a201da1
commit 8d4545315e
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Dockerfile
View File

@ -1,44 +1,39 @@
FROM ubuntu:trusty
FROM ubuntu:xenial
MAINTAINER Dave P
# Create user (user/password is deluge)
RUN useradd --create-home --uid 1000 deluge ; \
echo "deluge:deluge" | chpasswd ; \
locale-gen en
# Create user with user/password 'deluge'
RUN useradd --create-home --uid 1000 deluge && \
echo "deluge:deluge" | chpasswd
# Install deluge
COPY auth /home/deluge/.config/deluge/
COPY core.conf /home/deluge/.config/deluge/
COPY web_plugin.conf /home/deluge/.config/deluge/
COPY web.conf /home/deluge/.config/
RUN apt-get update ; \
apt-get install -y software-properties-common ; \
add-apt-repository -y ppa:deluge-team/ppa ; \
apt-get update ; \
apt-get -y install deluged deluge-web deluge-console ; \
chown -R deluge /home/deluge/.config ; \
RUN apt-get update && \
apt-get -y install deluged deluge-web deluge-console && \
chown -R deluge /home/deluge/.config && \
chgrp -R deluge /home/deluge/.config
# Install supervisor, vnstat
RUN apt-get -y install supervisor vnstat
COPY deluged.conf /etc/supervisor/conf.d/deluged.conf
COPY deluged.conf /etc/supervisor/conf.d/deluged.conf
COPY vnstatd.conf etc/supervisor/conf.d/vnstatd.conf
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
RUN chown -R deluge /var/lib/vnstat ; \
chgrp -R deluge /var/lib/vnstat ; \
sed -i -e"s/^UnitMode\s0/UnitMode 1/" /etc/vnstat.conf ; \
RUN chown -R deluge /var/lib/vnstat && \
chgrp -R deluge /var/lib/vnstat && \
sed -i -e"s/^UnitMode\s0/UnitMode 1/" /etc/vnstat.conf && \
sed -i -e"s/^RateUnit\s1/RateUnit 0/" /etc/vnstat.conf
# Install openvpn
RUN apt-get install -y openvpn ; dpkg -l
RUN apt-get install -y openvpn iproute2 && dpkg -l
COPY openvpn.conf /etc/supervisor/conf.d/openvpn.conf
# Expose deluge-web, deluge
EXPOSE 8112
EXPOSE 58846
#EXPOSE 8113 # deluge-web https
# REMEMBER TO MANUALLY SPECIFY A PEER PORT ON RUN
# EXPOSE 8113 # deluge-web https
# on run, also set a tcp/udp port for torrent peering
# Set boot command
ENTRYPOINT ["supervisord"]

1
deluged.conf
View File

@ -3,3 +3,4 @@ autorestart=true
command=/usr/bin/deluged --do-not-daemonize
user=deluge
environment=HOME="/home/deluge",USER="deluge"
stopwaitsecs=180