Merge pull request #1380 from kushagharahi/dev

Remove DOCKER_LOG in favor of LOG_TO_STDOUT

DockerEnv

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

Dockerfile

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

Dockerfile.armhf

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

openvpn/persistEnvironment.py

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

transmission/start.sh

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

transmission/userSetup.sh

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