mirrors/docker-transmission-openvpn
1
0
Fork 0
mirror of https://github.com/haugene/docker-transmission-openvpn.git synced 2025-08-18 04:07:07 +02:00
Code Issues Projects Releases Wiki Activity

Fix build and some restructuring after #324

Browse Source
This commit is contained in:
Kristian Haugene 2017-11-18 14:36:31 +01:00
parent efce3d8b57
commit c7a00b3525
3 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Dockerfile
View File

@ -1,7 +1,3 @@
# Transmission and OpenVPN
#
# Version 1.15
FROM ubuntu:16.04 FROM ubuntu:16.04
MAINTAINER Kristian Haugene MAINTAINER Kristian Haugene
@ -10,26 +6,24 @@ VOLUME /config
# Update packages and install software # Update packages and install software
RUN apt-get update \ RUN apt-get update \
&& apt-get -y install software-properties-common ufw \ && apt-get -y upgrade \
&& add-apt-repository multiverse \ && apt-get -y install software-properties-common wget \
&& add-apt-repository ppa:transmissionbt/ppa \ && add-apt-repository ppa:transmissionbt/ppa \
&& apt-get update \ && wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg | apt-key add - \
&& apt-get install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip wget \
&& wget -O /tmp/release.zip https://github.com/Secretmapper/combustion/archive/release.zip \
&& unzip -d /tmp /tmp/release.zip ; rm /tmp/*.zip \
&& mkdir /usr/bin/transmission-combustion/ ; mv /tmp/combustion-release/* /usr/bin/transmission-combustion/ \
&& 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-get update \
&& apt-get install -y openvpn \ && apt-get install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip ufw iputils-ping openvpn \
&& wget https://github.com/Secretmapper/combustion/archive/release.zip \
&& unzip release.zip -d /opt/transmission-ui/ \
&& rm release.zip \
&& 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/v1.2.0/dumb-init_1.2.0_amd64.deb \
&& dpkg -i dumb-init_1.2.0_amd64.deb \ && dpkg -i dumb-init_1.2.0_amd64.deb \
&& rm -rf dumb-init_1.2.0_amd64.deb \ && rm -rf dumb-init_1.2.0_amd64.deb \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
&& 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/v0.5.0/dockerize-linux-amd64-v0.5.0.tar.gz | tar -C /usr/local/bin -xzv \
&& apt-get 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
ADD openvpn/ /etc/openvpn/ ADD openvpn/ /etc/openvpn/
ADD transmission/ /etc/transmission/ ADD transmission/ /etc/transmission/

13
Dockerfile.armhf
View File

@ -1,7 +1,3 @@
# Transmission and OpenVPN
#
# Version 1.10
FROM resin/rpi-raspbian:jessie FROM resin/rpi-raspbian:jessie
MAINTAINER Kristian Haugene MAINTAINER Kristian Haugene
@ -10,11 +6,12 @@ VOLUME /config
# Update packages and install software # Update packages and install software
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y transmission-cli transmission-common transmission-daemon \ && apt-get -y upgrade \
&& wget -O /tmp/release.zip https://github.com/Secretmapper/combustion/archive/release.zip \ && apt-get -y install transmission-cli transmission-common transmission-daemon \
&& unzip -d /tmp /tmp/release.zip ; rm /tmp/*.zip \
&& mkdir /usr/bin/transmission-combustion/ ; mv /tmp/combustion-release/* /usr/bin/transmission-combustion/ \
&& apt-get install -y openvpn curl ufw \ && apt-get install -y openvpn curl ufw \
&& wget https://github.com/Secretmapper/combustion/archive/release.zip \
&& unzip release.zip -d /opt/transmission-ui/ \
&& rm release.zip \
&& curl -sLO https://archive.raspbian.org/raspbian/pool/main/d/dumb-init/dumb-init_1.0.3-1_armhf.deb \ && curl -sLO https://archive.raspbian.org/raspbian/pool/main/d/dumb-init/dumb-init_1.0.3-1_armhf.deb \
&& dpkg -i dumb-init_*.deb \ && dpkg -i dumb-init_*.deb \
&& rm -rf dumb-init_*.deb \ && rm -rf dumb-init_*.deb \

2
transmission/start.sh
View File

@ -10,7 +10,7 @@ export TRANSMISSION_BIND_ADDRESS_IPV4=$4
if [ "true" = "$ENABLE_COMBUSTION_UI" ]; then if [ "true" = "$ENABLE_COMBUSTION_UI" ]; then
echo "Using Combustion UI, overriding TRANSMISSION_WEB_HOME" echo "Using Combustion UI, overriding TRANSMISSION_WEB_HOME"
export TRANSMISSION_WEB_HOME=/usr/bin/transmission-combustion export TRANSMISSION_WEB_HOME=/opt/transmission-ui/combustion-release
fi fi
echo "Generating transmission settings.json from env variables" echo "Generating transmission settings.json from env variables"