From 12a8271ef6b349406798f763ed3666fa26e9feae Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 12 Aug 2024 15:32:37 -0400 Subject: [PATCH 1/2] docker config changes --- docker-compose-dev.yml | 4 +++- docker-compose-local-build.yml | 2 ++ docker-compose.yml | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 36e7e1e..07dd82a 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -124,6 +124,7 @@ services: REMS_ADMIN_FHIR_URL: http://rems-administrator:8090/4_0_0 MONGO_URL: mongodb://pims_remsadmin_mongo:27017/pims EHR_RXFILL_URL: http://host.docker.internal:8080/test-ehr/script/rxfill + INTERMEDIARY_FHIR_URL: http://rems-intermediary:3003/4_0_0 volumes: - rems_dev_pims-sync:/home/node/app:nocopy - rems_dev_pims-nodeModules:/home/node/app/frontend/node_modules @@ -136,9 +137,10 @@ services: dockerfile: Dockerfile.dev container_name: rems_dev_rems-intermediary environment: - MONGO_URL: mongodb://intermediary-user:pass@pims_remsadmin_mongo:27017 VITE_AUTH: http://keycloak:8080 + MONGO_URL: mongodb://intermediary-user:pass@pims_remsadmin_mongo:27017 REMS_ADMIN_HOOK_PATH: http://rems-administrator:8090/cds-services/rems- + REMS_ADMIN_FHIR_PATH: http://rems-administrator:8090/4_0_0 ports: - "3003:3003" volumes: diff --git a/docker-compose-local-build.yml b/docker-compose-local-build.yml index 49f0dbc..bacdd4a 100644 --- a/docker-compose-local-build.yml +++ b/docker-compose-local-build.yml @@ -95,6 +95,7 @@ services: REMS_ADMIN_FHIR_URL: http://rems-administrator:8090/4_0_0 MONGO_URL: mongodb://pims_remsadmin_mongo:27017/pims EHR_RXFILL_URL: http://host.docker.internal:8080/test-ehr/script/rxfill + INTERMEDIARY_FHIR_URL: http://rems-intermediary:3003/4_0_0 rems-intermediary: build: @@ -104,6 +105,7 @@ services: VITE_AUTH: http://keycloak:8080 MONGO_URL: mongodb://intermediary-user:pass@pims_remsadmin_mongo:27017 REMS_ADMIN_HOOK_PATH: http://rems-administrator:8090/cds-services/rems- + REMS_ADMIN_FHIR_PATH: http://rems-administrator:8090/4_0_0 ports: - "3003:3003" diff --git a/docker-compose.yml b/docker-compose.yml index 26a6639..85f5cff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -85,6 +85,7 @@ services: REMS_ADMIN_FHIR_URL: http://rems-administrator:8090/4_0_0 MONGO_URL: mongodb://pims_remsadmin_mongo:27017/pims EHR_RXFILL_URL: http://host.docker.internal:8080/test-ehr/script/rxfill + INTERMEDIARY_FHIR_URL: http://rems-intermediary:3003/4_0_0 ports: - "5050:5050" - "5051:5051" @@ -97,10 +98,10 @@ services: VITE_AUTH: http://keycloak:8080 MONGO_URL: mongodb://intermediary-user:pass@pims_remsadmin_mongo:27017 REMS_ADMIN_HOOK_PATH: http://rems-administrator:8090/cds-services/rems- + REMS_ADMIN_FHIR_PATH: http://rems-administrator:8090/4_0_0 ports: - "3003:3003" - volumes: rems_prod_keycloak-data: rems_prod_pims_remsadmin_mongo: From d0a376cd3706a85db9101b39b3b110da16354bb2 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Mon, 12 Aug 2024 15:37:03 -0400 Subject: [PATCH 2/2] trailing / --- EnvironmentVariables.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/EnvironmentVariables.md b/EnvironmentVariables.md index de87e9b..83d1896 100644 --- a/EnvironmentVariables.md +++ b/EnvironmentVariables.md @@ -156,6 +156,7 @@ - `VITE_PASSWORD` - `VITE_CLIENT` - `REMS_ADMIN_HOOK_PATH` + - `REMS_ADMIN_FHIR_PATH` ## Repositories that use environment variables @@ -303,6 +304,7 @@ - `SMART_ENDPOINT` - `WHITELIST` - `REMS_ADMIN_HOOK_PATH` + - `REMS_ADMIN_FHIR_PATH` - src/server.ts - `HTTPS_CERT_PATH` - `HTTPS_KEY_PATH`