upgrade base to bionic
This commit is contained in:
parent
0e2a201da1
commit
91d15bc168
32
Dockerfile
32
Dockerfile
@ -1,36 +1,34 @@
|
||||
FROM ubuntu:trusty
|
||||
MAINTAINER Dave P
|
||||
FROM ubuntu:bionic
|
||||
|
||||
# Create user (user/password is deluge)
|
||||
RUN useradd --create-home --uid 1000 deluge ; \
|
||||
echo "deluge:deluge" | chpasswd ; \
|
||||
locale-gen en
|
||||
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 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 && \
|
||||
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
|
||||
@ -38,7 +36,5 @@ EXPOSE 8112
|
||||
EXPOSE 58846
|
||||
#EXPOSE 8113 # deluge-web https
|
||||
|
||||
# REMEMBER TO MANUALLY SPECIFY A PEER PORT ON RUN
|
||||
|
||||
# Set boot command
|
||||
ENTRYPOINT ["supervisord"]
|
||||
|
@ -3,3 +3,4 @@ autorestart=true
|
||||
command=/usr/bin/deluged --do-not-daemonize
|
||||
user=deluge
|
||||
environment=HOME="/home/deluge",USER="deluge"
|
||||
stopwaitsecs=60
|
||||
|
Loading…
Reference in New Issue
Block a user