fix(gitignore): environment variable introduction (#364)

## Introduction Missing `SINGLE_LINE_LOG_FORMAT` env variable. ## Resolution * Added `SINGLE_LINE_LOG_FORMAT`. ## Miscellaneous * Dependencies updates * Updated `.gitignore` --------- Co-authored-by: Abhi Markan <[email protected]>
UK-Export-Finance · Jul 28, 2023 · 3336d22 · 3336d22
1 parent ee24d08
commit 3336d22
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 149 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,9 +1,12 @@
 # PORT
-PORT=
+PORT=3000
 
+# NODE
+NODE_ENV=development
+TZ=Europe/London 
 LOG_LEVEL=debug
 REDACT_LOGS=false
-SINGLE_LINE_LOG_FORMAT=true
+SINGLE_LINE_LOG_FORMAT=false
 
 # Swagger
 SWAGGER_USER=
@@ -34,12 +37,13 @@ DATABASE_CEDAR_NAME=
 DATABASE_CIS_HOST=
 DATABASE_CIS_NAME=
 
+# API
+API_KEY=
+
 # INFORMATICA
 APIM_INFORMATICA_URL=
 APIM_INFORMATICA_USERNAME=
 APIM_INFORMATICA_PASSWORD=
 APIM_INFORMATICA_MAX_REDIRECTS=
 APIM_INFORMATICA_TIMEOUT=
 
-# API
-API_KEY=
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -121,10 +121,11 @@ jobs:
             --revision-suffix v${{ github.run_id }} \
             --set-env-vars \
             "PORT=${{ secrets.PORT }}" \
-            "NODE_ENV=${{ secrets.NODE_ENV }}" \
-            "LOG_LEVEL=${{ secrets.LOG_LEVEL }}" \
-            "REDACT_LOGS=${{ secrets.REDACT_LOGS }}" \
             "TZ=${{ secrets.TZ }}" \
+            "NODE_ENV=${{ secrets.NODE_ENV }}" \
+            "LOG_LEVEL=${{ vars.LOG_LEVEL }}" \
+            "REDACT_LOGS=${{ vars.REDACT_LOGS }}" \
+            "SINGLE_LINE_LOG_FORMAT=${{ vars.SINGLE_LINE_LOG_FORMAT }}" \
             "SWAGGER_USER=${{ secrets.SWAGGER_USER }}" \
             "SWAGGER_PASSWORD=${{ secrets.SWAGGER_PASSWORD }}" \
             "DATABASE_PORT=${{ secrets.DATABASE_PORT }}" \

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # UKEF
-.env*
+.env
+.env.prod
 
 # compiled output
 /dist

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,9 +17,10 @@ services:
     environment:
       PORT:
       NODE_ENV:
+      TZ:
       LOG_LEVEL:
       REDACT_LOGS:
-      TZ:
+      SINGLE_LINE_LOG_FORMAT:
       SWAGGER_USER:
       SWAGGER_PASSWORD:
       DATABASE_PORT: