Merge pull request #205 from UN-OCHA/dsr/166-2

pushing all env var defaults to Dockerfile
UN-OCHA · Apr 24, 2019 · f791e1b · f791e1b
2 parents cffd47d + b7bc7e4
commit f791e1b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,11 @@
 FROM unocha/nodejs:8.11.3
 
-ENV BASIC_AUTH_USER=hi \
+ENV CTF_HOST=cdn.contentful.com \
+    CTF_SPACE_ID=123456 \
+    CTF_ENVIRONMENT=master \
+    CTF_CDA_ACCESS_TOKEN=1234567890 \
+    BASE_URL=http://dev.dsr.local \
+    BASIC_AUTH_USER=hi \
     BASIC_AUTH_PASS=bye
 
 WORKDIR /srv/www

diff --git a/nuxt.config.js b/nuxt.config.js
@@ -14,12 +14,12 @@ module.exports = {
   // Environment variables
   //
   env: {
-    CTF_HOST: process.env.CTF_HOST || 'cdn.contentful.com',
-    CTF_SPACE_ID: process.env.CTF_SPACE_ID || '123456',
-    CTF_ENVIRONMENT: process.env.CTF_ENVIRONMENT || 'master',
-    CTF_CDA_ACCESS_TOKEN: process.env.CTF_CDA_ACCESS_TOKEN || '1234567890', 
+    CTF_HOST: process.env.CTF_HOST,
+    CTF_SPACE_ID: process.env.CTF_SPACE_ID,
+    CTF_ENVIRONMENT: process.env.CTF_ENVIRONMENT,
+    CTF_CDA_ACCESS_TOKEN: process.env.CTF_CDA_ACCESS_TOKEN, 
     CTF_CDA_PREVIEW_TOKEN: process.env.CTF_CDA_PREVIEW_TOKEN,
-    baseUrl: process.env.BASE_URL || 'http://dev.dsr.local',
+    baseUrl: process.env.BASE_URL,
   },
   //
   // Global <head> metadata