diff --git a/DockerEnv b/DockerEnv index 2509f714e..7e9209b1a 100644 --- a/DockerEnv +++ b/DockerEnv @@ -85,3 +85,4 @@ #TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false #WEBPROXY_ENABLED=false #WEBPROXY_PORT=8888 +#DOCKER_LOG=false diff --git a/Dockerfile b/Dockerfile index 99a8261ad..d2b2ad50f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -133,7 +133,8 @@ ENV OPENVPN_USERNAME=**None** \ DROP_DEFAULT_ROUTE= \ WEBPROXY_ENABLED=false \ WEBPROXY_PORT=8888 \ - HEALTH_CHECK_HOST=google.com + HEALTH_CHECK_HOST=google.com \ + DOCKER_LOG=false HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh diff --git a/Dockerfile.alpine b/Dockerfile.alpine index 92c48087a..d39a30f65 100644 --- a/Dockerfile.alpine +++ b/Dockerfile.alpine @@ -119,7 +119,8 @@ ENV OPENVPN_USERNAME=**None** \ TRANSMISSION_WEB_HOME= \ DROP_DEFAULT_ROUTE= \ WEBPROXY_ENABLED=false \ - WEBPROXY_PORT=8888 + WEBPROXY_PORT=8888 \ + DOCKER_LOG=false # Expose port and run EXPOSE 9091 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4998dbc8a..21617f10e 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -126,7 +126,8 @@ ENV OPENVPN_USERNAME=**None** \ TRANSMISSION_WEB_HOME= \ DROP_DEFAULT_ROUTE= \ WEBPROXY_ENABLED=false \ - WEBPROXY_PORT=8888 + WEBPROXY_PORT=8888 \ + DOCKER_LOG=false # Expose port and run EXPOSE 9091 diff --git a/transmission/environment-variables.tmpl b/transmission/environment-variables.tmpl index 128ee3395..906ab4f67 100644 --- a/transmission/environment-variables.tmpl +++ b/transmission/environment-variables.tmpl @@ -94,3 +94,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 }} diff --git a/transmission/start.sh b/transmission/start.sh index 2e198f727..2da99df64 100755 --- a/transmission/start.sh +++ b/transmission/start.sh @@ -60,8 +60,14 @@ if [[ "true" = "$DROP_DEFAULT_ROUTE" ]]; then ip r del default || exit 1 fi +if [[ "true" = "$DOCKER_LOG" ]]; then + LOGFILE=/proc/1/fd/1 +else + LOGFILE=${TRANSMISSION_HOME}/transmission.log +fi + echo "STARTING TRANSMISSION" -exec su --preserve-environment ${RUN_AS} -s /bin/bash -c "/usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile ${TRANSMISSION_HOME}/transmission.log" & +exec su --preserve-environment ${RUN_AS} -s /bin/bash -c "/usr/bin/transmission-daemon -g ${TRANSMISSION_HOME} --logfile $LOGFILE" & if [[ "${OPENVPN_PROVIDER^^}" = "PIA" ]] then