Merge pull request #1646 from DFE-Digital/fix-docker-logs-for-differe…

…nt-rails-envs Fix Docker logs for different Rails envs
DFE-Digital · Sep 21, 2021 · 4ca5b8d · 4ca5b8d
2 parents 4343162 + 83f5785
commit 4ca5b8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.env.test b/.env.test
@@ -12,6 +12,8 @@ ADMIN_ALLOWED_IPS=::1,127.0.0.1
 GECKOBOARD_API_KEY=XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
 ENVIRONMENT_NAME=test
 
+RAILS_ENV=test
+
 ORDNANCE_SURVEY_API_BASE_URL=https://api.os.uk
 ORDNANCE_SURVEY_CLIENT_PARAMS={"key": "api-key-value"}
 STORAGE_BUCKET=test-bucket-name
diff --git a/Dockerfile b/Dockerfile
@@ -170,11 +170,11 @@ RUN chown -hR appuser:appgroup ${APP_HOME}/log
 RUN chown -hR appuser:appgroup ${APP_HOME}/app
 RUN chown -hR appuser:appgroup ${APP_HOME}/tmp
 
-RUN touch ${APP_HOME}/log/production.log
+RUN touch ${APP_HOME}/log/${RAILS_ENV}.log
 
-RUN chown -hR appuser:appgroup ${APP_HOME}/log/production.log
+RUN chown -hR appuser:appgroup ${APP_HOME}/log/${RAILS_ENV}.log
 
-RUN chmod 777 ${APP_HOME}/log/production.log
+RUN chmod 777 ${APP_HOME}/log/${RAILS_ENV}.log
 
 USER appuser
 
@@ -217,10 +217,10 @@ RUN chown -hR appuser:appgroup ${APP_HOME}/log
 RUN chown -hR appuser:appgroup ${APP_HOME}/app
 RUN chown -hR appuser:appgroup ${APP_HOME}/tmp
 
-RUN touch ${APP_HOME}/log/production.log
+RUN touch ${APP_HOME}/log/${RAILS_ENV}.log
 
-RUN chown -hR appuser:appgroup ${APP_HOME}/log/production.log
+RUN chown -hR appuser:appgroup ${APP_HOME}/log/${RAILS_ENV}.log
 
-RUN chmod 777 ${APP_HOME}/log/production.log
+RUN chmod 777 ${APP_HOME}/log/${RAILS_ENV}.log
 
 USER appuser