use xenial, longer timeout
This commit is contained in:
parent
0e2a201da1
commit
8d4545315e
33
Dockerfile
33
Dockerfile
|
@ -1,44 +1,39 @@
|
||||||
FROM ubuntu:trusty
|
FROM ubuntu:xenial
|
||||||
MAINTAINER Dave P
|
MAINTAINER Dave P
|
||||||
|
|
||||||
# Create user (user/password is deluge)
|
# Create user with user/password 'deluge'
|
||||||
RUN useradd --create-home --uid 1000 deluge ; \
|
RUN useradd --create-home --uid 1000 deluge && \
|
||||||
echo "deluge:deluge" | chpasswd ; \
|
echo "deluge:deluge" | chpasswd
|
||||||
locale-gen en
|
|
||||||
|
|
||||||
# Install deluge
|
# Install deluge
|
||||||
COPY auth /home/deluge/.config/deluge/
|
COPY auth /home/deluge/.config/deluge/
|
||||||
COPY core.conf /home/deluge/.config/deluge/
|
COPY core.conf /home/deluge/.config/deluge/
|
||||||
COPY web_plugin.conf /home/deluge/.config/deluge/
|
COPY web_plugin.conf /home/deluge/.config/deluge/
|
||||||
COPY web.conf /home/deluge/.config/
|
COPY web.conf /home/deluge/.config/
|
||||||
RUN apt-get update ; \
|
RUN apt-get update && \
|
||||||
apt-get install -y software-properties-common ; \
|
apt-get -y install deluged deluge-web deluge-console && \
|
||||||
add-apt-repository -y ppa:deluge-team/ppa ; \
|
chown -R deluge /home/deluge/.config && \
|
||||||
apt-get update ; \
|
|
||||||
apt-get -y install deluged deluge-web deluge-console ; \
|
|
||||||
chown -R deluge /home/deluge/.config ; \
|
|
||||||
chgrp -R deluge /home/deluge/.config
|
chgrp -R deluge /home/deluge/.config
|
||||||
|
|
||||||
# Install supervisor, vnstat
|
# Install supervisor, vnstat
|
||||||
RUN apt-get -y 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 vnstatd.conf etc/supervisor/conf.d/vnstatd.conf
|
||||||
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
||||||
RUN chown -R deluge /var/lib/vnstat ; \
|
RUN chown -R deluge /var/lib/vnstat && \
|
||||||
chgrp -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/^UnitMode\s0/UnitMode 1/" /etc/vnstat.conf && \
|
||||||
sed -i -e"s/^RateUnit\s1/RateUnit 0/" /etc/vnstat.conf
|
sed -i -e"s/^RateUnit\s1/RateUnit 0/" /etc/vnstat.conf
|
||||||
|
|
||||||
# Install openvpn
|
# 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
|
COPY openvpn.conf /etc/supervisor/conf.d/openvpn.conf
|
||||||
|
|
||||||
# Expose deluge-web, deluge
|
# Expose deluge-web, deluge
|
||||||
EXPOSE 8112
|
EXPOSE 8112
|
||||||
EXPOSE 58846
|
EXPOSE 58846
|
||||||
#EXPOSE 8113 # deluge-web https
|
# EXPOSE 8113 # deluge-web https
|
||||||
|
# on run, also set a tcp/udp port for torrent peering
|
||||||
# REMEMBER TO MANUALLY SPECIFY A PEER PORT ON RUN
|
|
||||||
|
|
||||||
# Set boot command
|
# Set boot command
|
||||||
ENTRYPOINT ["supervisord"]
|
ENTRYPOINT ["supervisord"]
|
||||||
|
|
|
@ -3,3 +3,4 @@ autorestart=true
|
||||||
command=/usr/bin/deluged --do-not-daemonize
|
command=/usr/bin/deluged --do-not-daemonize
|
||||||
user=deluge
|
user=deluge
|
||||||
environment=HOME="/home/deluge",USER="deluge"
|
environment=HOME="/home/deluge",USER="deluge"
|
||||||
|
stopwaitsecs=180
|
||||||
|
|
Loading…
Reference in New Issue