Fixed env variable handling in Dockerfile

YaleSTC · Jul 17, 2020 · 9a1892e · 9a1892e
1 parent a6c39f2
commit 9a1892e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 * Fixed deprecation warnings ([#1787](https://gitlab.com/yale-sdmp/reservations/issues/1787)).
 * Fixed CI build for cron ([#1816](https://gitlab.com/yale-sdmp/reservations/issues/1816)).
 * Fixed Docker logging to STDOUT ([#1819](https://gitlab.com/yale-sdmp/reservations/issues/1819)).
+* Fixed environment variable handling in Dockerfile.prod ([#1821](https://gitlab.com/yale-sdmp/reservations/issues/1821)).
 
 ### Security
 * Updated Nokogiri from 10.10.4 to 10.10.5 for CVE-2019-13117 ([#1792](https://gitlab.com/yale-sdmp/reservations/issues/1792)).

diff --git a/Dockerfile.cron b/Dockerfile.cron
@@ -1,5 +1,4 @@
 FROM ruby:2.6.5
-ARG MASTER_KEY=$MASTER_KEY
 
 # Add NodeJS repo
 RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -

diff --git a/Dockerfile.prod b/Dockerfile.prod
@@ -1,5 +1,4 @@
 FROM ruby:2.6.5
-ARG MASTER_KEY=$MASTER_KEY
 
 # Add NodeJS repo
 RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
@@ -29,6 +28,7 @@ RUN yarn install
 COPY . /usr/src/app/
 WORKDIR /usr/src/app
 COPY config/database.yml.example.production config/database.yml
+COPY config/secrets.yml.example config/secrets.yml
 
 # Add entrypoint
 COPY entrypoint-prod.sh /usr/bin/

diff --git a/entrypoint-prod.sh b/entrypoint-prod.sh
@@ -5,7 +5,7 @@ set -e
 rm -f /app/tmp/pids/server.pid
 
 # Precompile assets
-SECRET_KEY_BASE=$MASTER_KEY RAILS_ENV=production rails assets:precompile
+SECRET_KEY_BASE=$SECRET_KEY_BASE RAILS_ENV=production rails assets:precompile
 
 # Then exec the container's main process (what's set as CMD in the Dockerfile).
 exec "$@"