From 9b01cb3983d91493a7c92ecc5fdaf474e7fed486 Mon Sep 17 00:00:00 2001 From: RA341 Date: Sun, 25 Feb 2024 18:31:15 -0500 Subject: [PATCH 1/2] added env for database detection --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index f5c23215..e6921163 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,7 @@ services: dockerfile: api.Dockerfile environment: WAIT_HOSTS: db:5432 + dev: 0 # value here is irrelevant; just here to make sure dev env exists depends_on: db: condition: service_started From e8ac1ef9dfe1ec8736688662269cf12245cbd06c Mon Sep 17 00:00:00 2001 From: RA341 Date: Sun, 25 Feb 2024 18:31:48 -0500 Subject: [PATCH 2/2] added a variable that will detect if dev exists or not and apply host names accordingly --- devU-api/src/environment.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/devU-api/src/environment.ts b/devU-api/src/environment.ts index 604bacb3..980ce5a7 100644 --- a/devU-api/src/environment.ts +++ b/devU-api/src/environment.ts @@ -47,19 +47,24 @@ const refreshTokenExp = load('auth.jwt.refreshTokenValiditySeconds') || 864000 const accessTokenExp = load('auth.jwt.accessTokenValiditySeconds') || 600 const refreshTokenBuffer = load('auth.jwt.refreshTokenExpirationBufferSeconds') || 864000 +// if the dev env exists then file is running inside docker +// if it is undefined it is running on dev machine +const isDocker = !(process.env.dev === undefined) + + const environment = { port, apiUrl, clientUrl: (process.env.CLIENT_URL || load('api.clientUrl') || 'http://localhost:9000') as string, // Database settings - dbHost: (load('database.host') || 'localhost') as string, + dbHost: isDocker ? load('database.host') : 'localhost' as string, dbUsername: (load('database.username') || 'typescript_user') as string, dbPassword: (load('database.password') || 'password') as string, database: (load('database.name') || 'typescript_api') as string, - + // the below one is for local migration, due to some issues with command will not running load function nor 'localhost' - + // dbHost: ('localhost') as string, // dbUsername: ('typescript_user') as string, // dbPassword: ('password') as string, @@ -67,7 +72,7 @@ const environment = { // MinIO setting - minioHost: (load('minio.host') || 'localhost') as string, + minioHost: isDocker ? load('minio.host') : 'localhost' as string, minioPort: (load('minio.port') || 9002) as number, minioUsername: (load('minio.username') || 'typescript_user') as string, minioPassword: (load('minio.password') || 'changeMe') as string,