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

add combustion

Browse Source
This commit is contained in:
Garret Hicks
2017-10-22 00:18:12 -07:00
parent 7a5f19015b
commit 4bc9a89e22
4 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -15,6 +15,9 @@ RUN apt-get update \
&& add-apt-repository ppa:transmissionbt/ppa \ && add-apt-repository ppa:transmissionbt/ppa \
&& apt-get update \ && apt-get update \
&& apt-get install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip wget \ && apt-get install -y sudo transmission-cli transmission-common transmission-daemon curl rar unrar zip unzip wget \
&& wget -O - https://github.com/Secretmapper/combustion/archive/release.zip \
&& unzip release.zip ; rm *.zip \
&& mkdir /usr/bin/transmission-daemon/combustion ; mv combustion-release/* /usr/bin/transmission-daemon/combustion \
&& 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-get update \
@@ -107,6 +110,7 @@ ENV OPENVPN_USERNAME=**None** \
TRANSMISSION_WATCH_DIR_ENABLED=true \ TRANSMISSION_WATCH_DIR_ENABLED=true \
TRANSMISSION_HOME=/data/transmission-home \ TRANSMISSION_HOME=/data/transmission-home \
ENABLE_UFW=false \ ENABLE_UFW=false \
ENABLE_COMBUSTION_UI=false \
PUID=\ PUID=\
PGID=\ PGID=\
TRANSMISSION_WEB_HOME= TRANSMISSION_WEB_HOME=

4
Dockerfile.armhf
View File

@@ -11,6 +11,9 @@ 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 install -y transmission-cli transmission-common transmission-daemon \
&& wget -O - https://github.com/Secretmapper/combustion/archive/release.zip \
&& unzip release.zip ; rm *.zip \
&& mkdir /usr/bin/transmission-daemon/combustion ; mv combustion-release/* /usr/bin/transmission-daemon/combustion \
&& apt-get install -y openvpn curl ufw \ && apt-get install -y openvpn curl ufw \
&& 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 \
@@ -101,6 +104,7 @@ ENV OPENVPN_USERNAME=**None** \
TRANSMISSION_WATCH_DIR_ENABLED=true \ TRANSMISSION_WATCH_DIR_ENABLED=true \
TRANSMISSION_HOME=/data/transmission-home \ TRANSMISSION_HOME=/data/transmission-home \
ENABLE_UFW=false \ ENABLE_UFW=false \
ENABLE_COMBUSTION_UI=false \
PUID=\ PUID=\
PGID=\ PGID=\
TRANSMISSION_WEB_HOME= TRANSMISSION_WEB_HOME=

1
transmission/environment-variables.tmpl
View File

@@ -74,6 +74,7 @@ export TRANSMISSION_WATCH_DIR_ENABLED={{ .Env.TRANSMISSION_WATCH_DIR_ENABLED }}
export OPENVPN_PROVIDER={{ .Env.OPENVPN_PROVIDER }} export OPENVPN_PROVIDER={{ .Env.OPENVPN_PROVIDER }}
export ENABLE_UFW={{ .Env.ENABLE_UFW }} export ENABLE_UFW={{ .Env.ENABLE_UFW }}
export ENABLE_COMBUSTION_UI={{ .Env.ENABLE_COMBUSTION_UI }}
export PUID={{ .Env.PUID }} export PUID={{ .Env.PUID }}
export PGID={{ .Env.PGID }} export PGID={{ .Env.PGID }}

5
transmission/start.sh
View File

@@ -19,6 +19,11 @@ if [ ! -e "/dev/random" ]; then
ln -s /dev/urandom /dev/random ln -s /dev/urandom /dev/random
fi fi
if [ "true" = "$ENABLE_UFW" ]; then
echo "Using Combustin UI, overriding TRANSMISSION_WEB_HOME"
export TRANSMISSION_WEB_HOME=//usr/bin/transmission-daemon/combustion
fi
. /etc/transmission/userSetup.sh . /etc/transmission/userSetup.sh
echo "STARTING TRANSMISSION" echo "STARTING TRANSMISSION"