mirrors/docker-transmission-openvpn
1
0
Fork 0
mirror of https://github.com/haugene/docker-transmission-openvpn.git synced 2025-08-12 09:17:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #938 from pkishino/logging

Browse Source 
Added option to log transmission to docker logs
This commit is contained in:
Kristian Haugene 2020-02-02 22:28:59 +01:00 committed by GitHub
commit 95c15a3be9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DockerEnv
View File

@ -85,3 +85,4 @@
#TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false #TRANSMISSION_WATCH_DIR_FORCE_GENERIC=false
#WEBPROXY_ENABLED=false #WEBPROXY_ENABLED=false
#WEBPROXY_PORT=8888 #WEBPROXY_PORT=8888
#DOCKER_LOG=false

3
Dockerfile
View File

@ -133,7 +133,8 @@ ENV OPENVPN_USERNAME=**None** \
DROP_DEFAULT_ROUTE= \ DROP_DEFAULT_ROUTE= \
WEBPROXY_ENABLED=false \ WEBPROXY_ENABLED=false \
WEBPROXY_PORT=8888 \ WEBPROXY_PORT=8888 \
HEALTH_CHECK_HOST=google.com HEALTH_CHECK_HOST=google.com \
DOCKER_LOG=false
HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh HEALTHCHECK --interval=5m CMD /etc/scripts/healthcheck.sh

3
Dockerfile.alpine
View File

@ -119,7 +119,8 @@ ENV OPENVPN_USERNAME=**None** \
TRANSMISSION_WEB_HOME= \ TRANSMISSION_WEB_HOME= \
DROP_DEFAULT_ROUTE= \ DROP_DEFAULT_ROUTE= \
WEBPROXY_ENABLED=false \ WEBPROXY_ENABLED=false \
WEBPROXY_PORT=8888 WEBPROXY_PORT=8888 \
DOCKER_LOG=false
# Expose port and run # Expose port and run
EXPOSE 9091 EXPOSE 9091

3
Dockerfile.armhf
View File

@ -126,7 +126,8 @@ ENV OPENVPN_USERNAME=**None** \
TRANSMISSION_WEB_HOME= \ TRANSMISSION_WEB_HOME= \
DROP_DEFAULT_ROUTE= \ DROP_DEFAULT_ROUTE= \
WEBPROXY_ENABLED=false \ WEBPROXY_ENABLED=false \
WEBPROXY_PORT=8888 WEBPROXY_PORT=8888 \
DOCKER_LOG=false
# Expose port and run # Expose port and run
EXPOSE 9091 EXPOSE 9091

3
transmission/environment-variables.tmpl
View File

@ -94,3 +94,6 @@ export DROP_DEFAULT_ROUTE={{ .Env.DROP_DEFAULT_ROUTE }}
# Support using transmission ids for transmission paths # Support using transmission ids for transmission paths
export GLOBAL_APPLY_PERMISSIONS={{ .Env.GLOBAL_APPLY_PERMISSIONS }} export GLOBAL_APPLY_PERMISSIONS={{ .Env.GLOBAL_APPLY_PERMISSIONS }}
#Support logging to docker logs
export DOCKER_LOG={{ .Env.DOCKER_LOG }}

8
transmission/start.sh
View File

@ -60,8 +60,14 @@ if [[ "true" = "$DROP_DEFAULT_ROUTE" ]]; then
ip r del default || exit 1 ip r del default || exit 1
fi fi
if [[ "true" = "$DOCKER_LOG" ]]; then
LOGFILE=/proc/1/fd/1
else
LOGFILE=${TRANSMISSION_HOME}/transmission.log
fi
echo "STARTING TRANSMISSION" 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" ]] if [[ "${OPENVPN_PROVIDER^^}" = "PIA" ]]
then then