fix: pass env variables to docker container in compose file

kasir-barati · May 4, 2024 · de97ff9 · de97ff9
1 parent 705d241
commit de97ff9
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 15 deletions.
diff --git a/.env.example b/.env.example
@@ -21,6 +21,7 @@ MONGO_INITDB_ROOT_PASSWORD=mongodb-password
 DATABASE_URL=mongodb://mongodb-user:mongodb-password@localhost:27017
 APP_HOST=localhost
 OAUTH_CONFIGURATION_CLIENT_SECRET=ee5e6b455bfe90afd80709da39a3b0d32f956018
+NODE_ENV=dev
 
 # Backend e2e
 FRONTEND_URL=http://localhost:3000

diff --git a/.github/workflows/backend-e2e-tests.workflow.yml b/.github/workflows/backend-e2e-tests.workflow.yml
@@ -74,11 +74,7 @@ jobs:
 
       - if: ${{ steps.changed-paths.outputs.is-backend == 'true' }}
         name: Starting backend service
-        run: |
-          printenv
-          echo =============================================
-          echo $OAUTH_CONFIGURATION_CLIENT_SECRET
-          docker compose up -d
+        run: docker compose up -d
         env:
           FUSIONAUTH_TENANT_ID: ${{ steps.terraform.outputs.fusionauth_tenant_id }}
           FUSIONAUTH_APPLICATION_ID: ${{ steps.terraform.outputs.fusionauth_application_id }}

diff --git a/apps/backend/src/app/configs/app.config.ts b/apps/backend/src/app/configs/app.config.ts
@@ -13,8 +13,6 @@ declare global {
 }
 
 export default registerAs('appConfigs', (): AppConfig => {
-  console.dir(process.env);
-
   const validatedEnvs = validateEnvs(
     process.env,
     EnvironmentVariables,
@@ -36,7 +34,7 @@ class EnvironmentVariables implements AppConfig {
 
   @IsOptional()
   @IsEnum(NodeEnv)
-  NODE_ENV: NodeEnv = NodeEnv.development;
+  NODE_ENV: NodeEnv = NodeEnv.dev;
 
   @IsOptional()
   @IsString()

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,12 +20,16 @@ services:
       FUSIONAUTH_TENANT_ID: ${FUSIONAUTH_TENANT_ID}
       FUSIONAUTH_APPLICATION_ID: ${FUSIONAUTH_APPLICATION_ID}
       FUSIONAUTH_ADMIN_GROUP_ID: ${FUSIONAUTH_ADMIN_GROUP_ID}
+      OAUTH_CONFIGURATION_CLIENT_SECRET: ${OAUTH_CONFIGURATION_CLIENT_SECRET}
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       FUSIONAUTH_POSTGRESQL_PASSWORD: ${FUSIONAUTH_POSTGRESQL_PASSWORD}
       MONGO_INITDB_DATABASE: ${MONGO_INITDB_DATABASE}
       MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME}
       MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD}
+      APP_HOST: ${APP_HOST} 
+      NODE_ENV: ${NODE_ENV} 
+      SWAGGER_PATH: ${SWAGGER_PATH}
       DATABASE_URL: ${DATABASE_URL}
     healthcheck:
       test: ["CMD-SHELL", "node", "/app/healthcheck.js"]

diff --git a/packages/backend/logger/src/lib/logger.service.spec.ts b/packages/backend/logger/src/lib/logger.service.spec.ts
@@ -9,7 +9,7 @@ describe('LoggerService', () => {
   describe(`NODE_ENV != ${NodeEnv.test}`, () => {
     beforeAll(() => {
       loggerModuleOptions = SinonMock.with<LoggerModuleOptions>({
-        nodeEnv: NodeEnv.development,
+        nodeEnv: NodeEnv.dev,
       });
       loggerService = new LoggerService(loggerModuleOptions);
     });
@@ -129,7 +129,7 @@ describe('LoggerService', () => {
     });
   });
 
-  describe(`NODE_ENV != ${NodeEnv.development}`, () => {
+  describe(`NODE_ENV != ${NodeEnv.dev}`, () => {
     beforeAll(() => {
       loggerModuleOptions = SinonMock.with<LoggerModuleOptions>({
         nodeEnv: NodeEnv.production,

diff --git a/packages/backend/logger/src/lib/logger.service.ts b/packages/backend/logger/src/lib/logger.service.ts
@@ -110,7 +110,7 @@ export class LoggerService extends ConsoleLogger {
     message: unknown,
     contextOrOptionalParams?: unknown,
   ): void {
-    if (this.loggerModuleOptions.nodeEnv !== NodeEnv.development) {
+    if (this.loggerModuleOptions.nodeEnv !== NodeEnv.dev) {
       return;
     }
 

diff --git a/packages/backend/logger/src/lib/static-logger.service.spec.ts b/packages/backend/logger/src/lib/static-logger.service.spec.ts
@@ -10,7 +10,7 @@ describe('StaticLoggerService', () => {
 
   describe(`NODE_ENV != ${NodeEnv.test}`, () => {
     beforeAll(() => {
-      process.env.NODE_ENV = NodeEnv.development;
+      process.env.NODE_ENV = NodeEnv.dev;
     });
 
     it('should log the message and context when NODE_ENV is not test', () => {
@@ -128,7 +128,7 @@ describe('StaticLoggerService', () => {
     });
   });
 
-  describe(`NODE_ENV != ${NodeEnv.development}`, () => {
+  describe(`NODE_ENV != ${NodeEnv.dev}`, () => {
     beforeAll(() => {
       process.env.NODE_ENV = NodeEnv.production;
     });

diff --git a/packages/backend/logger/src/lib/static-logger.service.ts b/packages/backend/logger/src/lib/static-logger.service.ts
@@ -97,7 +97,7 @@ export class StaticLoggerService extends Logger {
     context,
     optionalParams,
   }: StaticLoggerArgs) {
-    if (process.env.NODE_ENV !== NodeEnv.development) {
+    if (process.env.NODE_ENV !== NodeEnv.dev) {
       return;
     }
 

diff --git a/packages/shared/src/lib/types/node-env.type.ts b/packages/shared/src/lib/types/node-env.type.ts
@@ -15,7 +15,7 @@ declare global {
 }
 
 export enum NodeEnv {
-  development = 'development',
+  dev = 'dev',
   production = 'production',
   test = 'test',
   provision = 'provision',