diff --git a/DockerEnv b/DockerEnv index 78617adc0c..03d6201dd1 100644 --- a/DockerEnv +++ b/DockerEnv @@ -88,3 +88,4 @@ #WEBPROXY_USERNAME= #WEBPROXY_PASSWORD= #DOCKER_LOG=false +#LOG_TO_STDOUT=false diff --git a/Dockerfile b/Dockerfile index 6716ec9b98..21c8e6e21a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -136,7 +136,8 @@ ENV OPENVPN_USERNAME=**None** \ WEBPROXY_USERNAME= \ WEBPROXY_PASSWORD= \ HEALTH_CHECK_HOST=google.com \ - DOCKER_LOG=false + DOCKER_LOG=false \ + LOG_TO_STDOUT=false HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh diff --git a/Dockerfile.alpine b/Dockerfile.alpine index a87cc55002..f2b8344078 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -126,6 +126,7 @@ ENV OPENVPN_USERNAME=**None** \ WEBPROXY_USERNAME= \ WEBPROXY_PASSWORD= \ DOCKER_LOG=false \ + LOG_TO_STDOUT=false \ HEALTH_CHECK_HOST=google.com HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh diff --git a/Dockerfile.armhf b/Dockerfile.armhf index de50bbc4d8..ecbce3d853 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -130,6 +130,7 @@ ENV OPENVPN_USERNAME=**None** \ WEBPROXY_USERNAME= \ WEBPROXY_PASSWORD= \ DOCKER_LOG=false \ + LOG_TO_STDOUT=false \ HEALTH_CHECK_HOST=google.com HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh diff --git a/docs/arguments.md b/docs/arguments.md index 74732cc302..534ec5a970 100755 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -105,3 +105,11 @@ This might lead to the default route (your untunneled connection) to be used. To drop the default route set the environment variable `DROP_DEFAULT_ROUTE` to `true`. *Note*: This is not compatible with all VPNs. You can check your iptables routing with the `ip r` command in a running container. + +### Changing logging locations + +By default Transmission will log to a file in `TRANSMISSION_HOME/transmission.log`. + +To log to stdout instead set the environment variable `LOG_TO_STDOUT` to `true`. + +*Note*: By default stdout is what container engines read logs from. Set this to true to have Tranmission logs in commands like `docker logs` and `kubectl logs`. OpenVPN currently only logs to stdout. \ No newline at end of file diff --git a/transmission/environment-variables.tmpl b/transmission/environment-variables.tmpl index 5561047930..93e8196f5a 100644 --- a/transmission/environment-variables.tmpl +++ b/transmission/environment-variables.tmpl @@ -97,5 +97,6 @@ export DROP_DEFAULT_ROUTE={{ .Env.DROP_DEFAULT_ROUTE }} # Support using transmission ids for transmission paths export GLOBAL_APPLY_PERMISSIONS={{ .Env.GLOBAL_APPLY_PERMISSIONS }} -#Support logging to docker logs -export DOCKER_LOG={{ .Env.DOCKER_LOG }} +# Support logging to stdout which docker logs uses, mark either true +export DOCKER_LOG={{ .Env.DOCKER_LOG }} # DEPRECIATED -- variable name does not reflect usage +export LOG_TO_STDOUT={{ .Env.LOG_TO_STDOUT }} # Updated variable name diff --git a/transmission/start.sh b/transmission/start.sh index b977345302..dfe1cce72a 100755 --- a/transmission/start.sh +++ b/transmission/start.sh @@ -60,7 +60,7 @@ if [[ "true" = "$DROP_DEFAULT_ROUTE" ]]; then ip r del default || exit 1 fi -if [[ "true" = "$DOCKER_LOG" ]]; then +if [[ "true" = "$DOCKER_LOG" || "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 e645abb743..576d844ca4 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" ]]; then + if [[ "true" = "$DOCKER_LOG" || "true" = "$LOG_TO_STDOUT" ]]; then chown ${RUN_AS}:${RUN_AS} /dev/stdout fi