Merge pull request #346 from LaurentGoderre/stdout-env

Use existing redmine env var to log to stdout
docker-library · Dec 13, 2024 · 8b23c7e · 8b23c7e
2 parents 802df47 + 2f7ad78
commit 8b23c7e
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 16 deletions.
diff --git a/5.0/alpine3.19/Dockerfile b/5.0/alpine3.19/Dockerfile
diff --git a/5.0/alpine3.20/Dockerfile b/5.0/alpine3.20/Dockerfile
diff --git a/5.0/bookworm/Dockerfile b/5.0/bookworm/Dockerfile
diff --git a/5.1/alpine3.19/Dockerfile b/5.1/alpine3.19/Dockerfile
diff --git a/5.1/alpine3.20/Dockerfile b/5.1/alpine3.20/Dockerfile
diff --git a/5.1/bookworm/Dockerfile b/5.1/bookworm/Dockerfile
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -72,6 +72,7 @@ RUN set -eux; \
 ENV REDMINE_VERSION {{ .version }}
 ENV REDMINE_DOWNLOAD_URL {{ .downloadUrl }}
 ENV REDMINE_DOWNLOAD_SHA256 {{ .sha256 }}
+ENV RAILS_LOG_TO_STDOUT true
 
 RUN set -eux; \
 	wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
@@ -80,8 +81,6 @@ RUN set -eux; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
 	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
-# log to STDOUT (https://github.com/docker-library/redmine/issues/108)
-	echo 'config.logger = Logger.new(STDOUT)' > config/additional_environment.rb; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
 	find log tmp -type d -exec chmod 1777 '{}' +

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -73,6 +73,7 @@ RUN set -eux; \
 ENV REDMINE_VERSION {{ .version }}
 ENV REDMINE_DOWNLOAD_URL {{ .downloadUrl }}
 ENV REDMINE_DOWNLOAD_SHA256 {{ .sha256 }}
+ENV RAILS_LOG_TO_STDOUT true
 
 RUN set -eux; \
 # if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
@@ -82,8 +83,6 @@ RUN set -eux; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
 	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
-# log to STDOUT (https://github.com/docker-library/redmine/issues/108)
-	echo 'config.logger = Logger.new(STDOUT)' > config/additional_environment.rb; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
 	find log tmp -type d -exec chmod 1777 '{}' +