chore: try out docker env variable addition

opengovsg · Mar 14, 2023 · 27866ec · 27866ec
1 parent 79d3b8c
commit 27866ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -90,7 +90,7 @@ jobs:
             ${{ runner.OS }}-node-
             ${{ runner.OS }}-
       - run: npm ci --legacy-peer-deps
-      - run:  echo CLOUDMERSIVE_KEY_CI=${{secrets.CLOUDMERSIVE_KEY}} >> .env
+      - run: echo CLOUDMERSIVE_KEY=${{secrets.CLOUDMERSIVE_KEY}} >> .env
       - run: npm run test:e2e-headless
   gatekeep:
     name: Determine if Build & Deploy is needed

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,8 +14,6 @@ services:
       - '3000:3000' # Webpack dev server
       - '8080:8080' # Express
       - '9229:9229' # Debugging for Node.js
-    env_file:
-      - .env
     environment:
       - NODE_ENV=development
       - PORT=8080
@@ -46,7 +44,8 @@ services:
       - AWS_SECRET_ACCESS_KEY=foobar
       - CSP_ONLY_REPORT_VIOLATIONS=true
       - SAFE_BROWSING_KEY=
-      - CLOUDMERSIVE_KEY=
+      # https://stackoverflow.com/a/74069689 Removed the assignment operator so that .env file variables are used
+      - CLOUDMERSIVE_KEY
       - ASSET_VARIANT=gov
       - SES_HOST=maildev
       - SES_PORT=25

diff --git a/src/server/config.ts b/src/server/config.ts
@@ -224,10 +224,7 @@ export const cspReportUri = process.env.CSP_REPORT_URI
 
 export const safeBrowsingLogOnly = process.env.SAFE_BROWSING_LOG_ONLY === 'true'
 
-export const cloudmersiveKey: string | undefined = process.env
-  .CLOUDMERSIVE_KEY_CI
-  ? process.env.CLOUDMERSIVE_KEY_CI
-  : process.env.CLOUDMERSIVE_KEY
+export const cloudmersiveKey: string | undefined = process.env.CLOUDMERSIVE_KEY
 export const safeBrowsingKey: string | undefined = process.env.SAFE_BROWSING_KEY
 
 // LocalStack variables.