bea/docker-deluge-openvpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small rush up Dockerfile, extract lib versions

Browse Source
This commit is contained in:
Kristian Haugene
2019-03-09 18:02:20 +01:00
parent 0c2c47aa82
commit 43abe72c2a
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Dockerfile
View File

@@ -4,15 +4,19 @@ MAINTAINER Kristian Haugene
VOLUME /data VOLUME /data
VOLUME /config VOLUME /config
# Update packages and install software ARG DOCKERIZE_ARCH=amd64
RUN apt-get update \ ARG DOCKERIZE_VERSION=v0.6.1
&& apt-get -y upgrade \ ARG DUMBINIT_VERSION=1.2.2
&& apt-get -y install software-properties-common wget git curl jq \
# Update, upgrade and install core software
RUN apt update \
&& apt -y upgrade \
&& apt -y install software-properties-common wget git curl jq \
&& add-apt-repository ppa:transmissionbt/ppa \ && add-apt-repository ppa:transmissionbt/ppa \
&& wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add - \ && wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add - \
&& echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" > /etc/apt/sources.list.d/openvpn-aptrepo.list \ && echo "deb http://build.openvpn.net/debian/openvpn/stable xenial main" > /etc/apt/sources.list.d/openvpn-aptrepo.list \
&& apt-get update \ && apt update \
&& apt-get install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip ufw iputils-ping openvpn bc\ && apt install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip ufw iputils-ping openvpn bc \
python2.7 python2.7-pysqlite2 && ln -sf /usr/bin/python2.7 /usr/bin/python2 \ python2.7 python2.7-pysqlite2 && ln -sf /usr/bin/python2.7 /usr/bin/python2 \
&& wget https://github.com/Secretmapper/combustion/archive/release.zip \ && wget https://github.com/Secretmapper/combustion/archive/release.zip \
&& unzip release.zip -d /opt/transmission-ui/ \ && unzip release.zip -d /opt/transmission-ui/ \
@@ -26,12 +30,12 @@ RUN apt-get update \
&& tar -xvf src.tar.gz -C /opt/transmission-ui/transmission-web-control/ \ && tar -xvf src.tar.gz -C /opt/transmission-ui/transmission-web-control/ \
&& rm src.tar.gz \ && rm src.tar.gz \
&& git clone git://github.com/endor/kettu.git /opt/transmission-ui/kettu \ && git clone git://github.com/endor/kettu.git /opt/transmission-ui/kettu \
&& apt-get install -y tinyproxy telnet \ && apt install -y tinyproxy telnet \
&& wget https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64.deb \ && wget https://github.com/Yelp/dumb-init/releases/download/v${DUMBINIT_VERSION}/dumb-init_${DUMBINIT_VERSION}_amd64.deb \
&& dpkg -i dumb-init_1.2.0_amd64.deb \ && dpkg -i dumb-init_${DUMBINIT_VERSION}_amd64.deb \
&& rm -rf dumb-init_1.2.0_amd64.deb \ && rm -rf dumb-init_${DUMBINIT_VERSION}_amd64.deb \
&& curl -L https://github.com/jwilder/dockerize/releases/download/v0.5.0/dockerize-linux-amd64-v0.5.0.tar.gz | tar -C /usr/local/bin -xzv \ && curl -L https://github.com/jwilder/dockerize/releases/download/${DOCKERIZE_VERSION}/dockerize-linux-${DOCKERIZE_ARCH}-${DOCKERIZE_VERSION}.tar.gz | tar -C /usr/local/bin -xzv \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ && apt clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
&& groupmod -g 1000 users \ && groupmod -g 1000 users \
&& useradd -u 911 -U -d /config -s /bin/false abc \ && useradd -u 911 -U -d /config -s /bin/false abc \
&& usermod -G users abc && usermod -G users abc
@@ -41,8 +45,6 @@ ADD transmission/ /etc/transmission/
ADD tinyproxy /opt/tinyproxy/ ADD tinyproxy /opt/tinyproxy/
ADD scripts /etc/scripts/ ADD scripts /etc/scripts/
RUN chmod a+x /etc/scripts/healthcheck.sh
ENV OPENVPN_USERNAME=**None** \ ENV OPENVPN_USERNAME=**None** \
OPENVPN_PASSWORD=**None** \ OPENVPN_PASSWORD=**None** \
OPENVPN_PROVIDER=**None** \ OPENVPN_PROVIDER=**None** \