mirrors/docker-transmission-openvpn
1
0
Fork 0
mirror of https://github.com/haugene/docker-transmission-openvpn.git synced 2025-09-01 03:41:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1380 from kushagharahi/dev

Browse Source 
Remove DOCKER_LOG in favor of LOG_TO_STDOUT
This commit is contained in:
Kristian Haugene 2020-10-19 22:28:05 +02:00 committed by GitHub
commit e0eaa0e643
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DockerEnv
View File

@ -87,5 +87,4 @@
#WEBPROXY_PORT=8888 #WEBPROXY_PORT=8888
#WEBPROXY_USERNAME= #WEBPROXY_USERNAME=
#WEBPROXY_PASSWORD= #WEBPROXY_PASSWORD=
#DOCKER_LOG=false
#LOG_TO_STDOUT=false #LOG_TO_STDOUT=false

2
Dockerfile
View File

@ -46,7 +46,7 @@ ENV OPENVPN_USERNAME=**None** \
WEBPROXY_PORT=8888 \ WEBPROXY_PORT=8888 \
WEBPROXY_USERNAME= \ WEBPROXY_USERNAME= \
WEBPROXY_PASSWORD= \ WEBPROXY_PASSWORD= \
DOCKER_LOG=false \ LOG_TO_STDOUT=false \
HEALTH_CHECK_HOST=google.com HEALTH_CHECK_HOST=google.com
HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh HEALTHCHECK --interval=1m CMD /etc/scripts/healthcheck.sh

1
Dockerfile.armhf
View File

@ -52,7 +52,6 @@ ENV OPENVPN_USERNAME=**None** \
WEBPROXY_PORT=8888 \ WEBPROXY_PORT=8888 \
WEBPROXY_USERNAME= \ WEBPROXY_USERNAME= \
WEBPROXY_PASSWORD= \ WEBPROXY_PASSWORD= \
DOCKER_LOG=false \
LOG_TO_STDOUT=false \ LOG_TO_STDOUT=false \
HEALTH_CHECK_HOST=google.com HEALTH_CHECK_HOST=google.com

2
openvpn/persistEnvironment.py
View File

@ -19,7 +19,7 @@ wanted_variables = {
'PGID', 'PGID',
'DROP_DEFAULT_ROUTE', 'DROP_DEFAULT_ROUTE',
'GLOBAL_APPLY_PERMISSIONS', 'GLOBAL_APPLY_PERMISSIONS',
'DOCKER_LOG', 'LOG_TO_STDOUT',
} }
variables_to_persist = {} variables_to_persist = {}

2
transmission/start.sh
View File

@ -63,7 +63,7 @@ if [[ "true" = "$DROP_DEFAULT_ROUTE" ]]; then
ip r del default || exit 1 ip r del default || exit 1
fi fi
if [[ "true" = "$DOCKER_LOG" || "true" = "$LOG_TO_STDOUT" ]]; then if [[ "true" = "$LOG_TO_STDOUT" ]]; then
LOGFILE=/dev/stdout LOGFILE=/dev/stdout
else else
LOGFILE=${TRANSMISSION_HOME}/transmission.log LOGFILE=${TRANSMISSION_HOME}/transmission.log

2
transmission/userSetup.sh
View File

@ -13,7 +13,7 @@ if [ -n "$PUID" ] && [ ! "$(id -u root)" -eq "$PUID" ]; then
groupmod -o -g "$PGID" ${RUN_AS}; groupmod -o -g "$PGID" ${RUN_AS};
fi fi
if [[ "true" = "$DOCKER_LOG" || "true" = "$LOG_TO_STDOUT" ]]; then if [[ "true" = "$LOG_TO_STDOUT" ]]; then
chown ${RUN_AS}:${RUN_AS} /dev/stdout chown ${RUN_AS}:${RUN_AS} /dev/stdout
fi fi