Merge branch 'master' into merge/master-into-dev

This commit is contained in:
Kristian Haugene
2020-10-10 14:04:31 +02:00
7 changed files with 36 additions and 3 deletions

View File

@@ -63,7 +63,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

View File

@@ -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