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

Merge pull request #395 from aerickson/True_fixes

Browse Source 
Use CVE-patched packages
This commit is contained in:
Kristian Haugene
2018-02-05 20:02:05 +01:00
committed by GitHub
parent 9fc60ee93a 52885e054f
commit ae4db89696
5 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DockerEnv
View File

@@ -53,6 +53,8 @@
#TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false #TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false
#TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0 #TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0
#TRANSMISSION_RPC_ENABLED=true #TRANSMISSION_RPC_ENABLED=true
#TRANSMISSION_RPC_HOST_WHITELIST=
#TRANSMISSION_RPC_HOST_WHITELIST_ENABLED=true
#TRANSMISSION_RPC_PASSWORD=password #TRANSMISSION_RPC_PASSWORD=password
#TRANSMISSION_RPC_PORT=9091 #TRANSMISSION_RPC_PORT=9091
#TRANSMISSION_RPC_URL=/transmission/ #TRANSMISSION_RPC_URL=/transmission/

4
Dockerfile
View File

@@ -8,7 +8,7 @@ VOLUME /config
RUN apt-get update \ RUN apt-get update \
&& apt-get -y upgrade \ && apt-get -y upgrade \
&& apt-get -y install software-properties-common wget git \ && apt-get -y install software-properties-common wget git \
&& 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-get update \
@@ -80,6 +80,8 @@ ENV OPENVPN_USERNAME=**None** \
TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false \ TRANSMISSION_RPC_AUTHENTICATION_REQUIRED=false \
TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0 \ TRANSMISSION_RPC_BIND_ADDRESS=0.0.0.0 \
TRANSMISSION_RPC_ENABLED=true \ TRANSMISSION_RPC_ENABLED=true \
TRANSMISSION_RPC_HOST_WHITELIST= \
TRANSMISSION_RPC_HOST_WHITELIST_ENABLED=true \
TRANSMISSION_RPC_PASSWORD=password \ TRANSMISSION_RPC_PASSWORD=password \
TRANSMISSION_RPC_PORT=9091 \ TRANSMISSION_RPC_PORT=9091 \
TRANSMISSION_RPC_URL=/transmission/ \ TRANSMISSION_RPC_URL=/transmission/ \

2
transmission/environment-variables.tmpl
View File

@@ -47,6 +47,8 @@ export TRANSMISSION_RENAME_PARTIAL_FILES={{ .Env.TRANSMISSION_RENAME_PARTIAL_FIL
export TRANSMISSION_RPC_AUTHENTICATION_REQUIRED={{ .Env.TRANSMISSION_RPC_AUTHENTICATION_REQUIRED }} export TRANSMISSION_RPC_AUTHENTICATION_REQUIRED={{ .Env.TRANSMISSION_RPC_AUTHENTICATION_REQUIRED }}
export TRANSMISSION_RPC_BIND_ADDRESS={{ .Env.TRANSMISSION_RPC_BIND_ADDRESS }} export TRANSMISSION_RPC_BIND_ADDRESS={{ .Env.TRANSMISSION_RPC_BIND_ADDRESS }}
export TRANSMISSION_RPC_ENABLED={{ .Env.TRANSMISSION_RPC_ENABLED }} export TRANSMISSION_RPC_ENABLED={{ .Env.TRANSMISSION_RPC_ENABLED }}
export TRANSMISSION_RPC_HOST_WHITELIST={{ .Env.TRANSMISSION_RPC_HOST_WHITELIST }}
export TRANSMISSION_RPC_HOST_WHITELIST_ENABLED={{ .Env.TRANSMISSION_RPC_HOST_WHITELIST_ENABLED }}
export TRANSMISSION_RPC_PASSWORD={{ .Env.TRANSMISSION_RPC_PASSWORD }} export TRANSMISSION_RPC_PASSWORD={{ .Env.TRANSMISSION_RPC_PASSWORD }}
export TRANSMISSION_RPC_PORT={{ .Env.TRANSMISSION_RPC_PORT }} export TRANSMISSION_RPC_PORT={{ .Env.TRANSMISSION_RPC_PORT }}
export TRANSMISSION_RPC_URL={{ .Env.TRANSMISSION_RPC_URL }} export TRANSMISSION_RPC_URL={{ .Env.TRANSMISSION_RPC_URL }}

2
transmission/settings.tmpl
View File

@@ -46,6 +46,8 @@
"rpc-authentication-required": {{ .Env.TRANSMISSION_RPC_AUTHENTICATION_REQUIRED }}, "rpc-authentication-required": {{ .Env.TRANSMISSION_RPC_AUTHENTICATION_REQUIRED }},
"rpc-bind-address": "{{ .Env.TRANSMISSION_RPC_BIND_ADDRESS }}", "rpc-bind-address": "{{ .Env.TRANSMISSION_RPC_BIND_ADDRESS }}",
"rpc-enabled": {{ .Env.TRANSMISSION_RPC_ENABLED }}, "rpc-enabled": {{ .Env.TRANSMISSION_RPC_ENABLED }},
"rpc-host-whitelist": "{{ .Env.TRANSMISSION_RPC_HOST_WHITELIST }}",
"rpc-host-whitelist-enabled": {{ .Env.TRANSMISSION_RPC_HOST_WHITELIST_ENABLED }},
"rpc-password": "{{ .Env.TRANSMISSION_RPC_PASSWORD }}", "rpc-password": "{{ .Env.TRANSMISSION_RPC_PASSWORD }}",
"rpc-port": {{ .Env.TRANSMISSION_RPC_PORT }}, "rpc-port": {{ .Env.TRANSMISSION_RPC_PORT }},
"rpc-url": "{{ .Env.TRANSMISSION_RPC_URL }}", "rpc-url": "{{ .Env.TRANSMISSION_RPC_URL }}",

3
transmission/start.sh
View File

@@ -30,6 +30,9 @@ echo "Generating transmission settings.json from env variables"
mkdir -p ${TRANSMISSION_HOME} mkdir -p ${TRANSMISSION_HOME}
dockerize -template /etc/transmission/settings.tmpl:${TRANSMISSION_HOME}/settings.json dockerize -template /etc/transmission/settings.tmpl:${TRANSMISSION_HOME}/settings.json
echo "sed'ing True to true"
sed -i 's/True/true/g' ${TRANSMISSION_HOME}/settings.json
if [ ! -e "/dev/random" ]; then if [ ! -e "/dev/random" ]; then
# Avoid "Fatal: no entropy gathering module detected" error # Avoid "Fatal: no entropy gathering module detected" error
echo "INFO: /dev/random not found - symlink to /dev/urandom" echo "INFO: /dev/random not found - symlink to /dev/urandom"