From 4a8333b20ec3da3dfbfb2c44ebd7159b46776acf Mon Sep 17 00:00:00 2001
From: Kusha Gharahi <3326002+kushagharahi@users.noreply.github.com>
Date: Mon, 28 Sep 2020 19:40:15 -0500
Subject: [PATCH] Remove DOCKER_LOG infavor of LOG_TO_STDOUT

---
 DockerEnv                     | 1 -
 Dockerfile                    | 2 +-
 Dockerfile.armhf              | 1 -
 openvpn/persistEnvironment.py | 2 +-
 transmission/start.sh         | 2 +-
 transmission/userSetup.sh     | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/DockerEnv b/DockerEnv
index 03d6201dd..18bd4253b 100644
--- a/DockerEnv
+++ b/DockerEnv
@@ -87,5 +87,4 @@
 #WEBPROXY_PORT=8888
 #WEBPROXY_USERNAME=
 #WEBPROXY_PASSWORD=
-#DOCKER_LOG=false
 #LOG_TO_STDOUT=false
diff --git a/Dockerfile b/Dockerfile
index 08ac6ae47..962ffc30e 100644
--- a/Dockerfile
+++ b/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
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 54fa27dc3..9bd186068 100644
--- a/Dockerfile.armhf
+++ b/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
 
diff --git a/openvpn/persistEnvironment.py b/openvpn/persistEnvironment.py
index 14c36ffd8..a8fd15d90 100644
--- a/openvpn/persistEnvironment.py
+++ b/openvpn/persistEnvironment.py
@@ -19,7 +19,7 @@ wanted_variables = {
     'PGID',
     'DROP_DEFAULT_ROUTE',
     'GLOBAL_APPLY_PERMISSIONS',
-    'DOCKER_LOG',
+    'LOG_TO_STDOUT',
 }
 
 variables_to_persist = {}
diff --git a/transmission/start.sh b/transmission/start.sh
index 361250f24..fb60063d4 100755
--- a/transmission/start.sh
+++ b/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
diff --git a/transmission/userSetup.sh b/transmission/userSetup.sh
index 576d844ca..bbb815a65 100644
--- a/transmission/userSetup.sh
+++ b/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