Merge pull request #74 from mcode/env-vars

env configs for intermediary + rems admin + pims + request generator
mcode · Oct 28, 2024 · f0722be · f0722be
2 parents cbdef0d + d14420e
commit f0722be
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
@@ -115,7 +115,7 @@ jobs:
         working-directory: ./rems-setup
         env:
           VSAC_API_KEY: ${{secrets.VSAC_API_KEY}}
-
+          
       - uses: actions/setup-node@v3
         with:
           node-version: 18

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -96,6 +96,8 @@ services:
     ports:
       - "8090:8090"
       - "8091:8091"
+      - "9090:9090"
+      - "9091:9091"
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
       MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
@@ -118,12 +120,17 @@ services:
     ports:
       - "8095:8095"
       - "8096:8096"
+      - "9095:9095"
+      - "9096:9096"
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
       MONGO_DB_NAME: remsadmin2
       MONGO_URL: mongodb://rems-user2:pass@pims_remsadmin_mongo:27017
       SERVER_NAME: 'CodeX REMS Administrator Prototype #2'
       PORT: 8095
+      FRONTEND_PORT: 9095
+      AUTH_SERVER_URI: 'http://localhost:8095'
+      RESOURCE_SERVER: 'http://localhost:8095'
     volumes:
       - rems_dev_rems-admin2-sync:/rems-admin2:nocopy #  nocopy is important
       - rems_dev_rems-admin2-nodeModules:/rems-admin2/node_modules
@@ -169,6 +176,7 @@ services:
       REMS_ADMIN_FHIR_PATH: http://rems-administrator:8090/4_0_0
     ports:
       - "3003:3003"
+      - "9080:9080"
     volumes:
       - rems_dev_rems-intermediary-sync:/rems-intermediary:nocopy #  nocopy is important
       - rems_dev_rems-intermediary-nodeModules:/rems-intermediary/node_modules

diff --git a/docker-compose-local-build.yml b/docker-compose-local-build.yml
@@ -77,6 +77,8 @@ services:
     ports:
       - "8090:8090"
       - "8091:8091"
+      - "9090:9090"
+      - "9091:9091"
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
       MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
@@ -94,12 +96,17 @@ services:
     ports:
       - "8095:8095"
       - "8096:8096"
+      - "9095:9095"
+      - "9096:9096"
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
       MONGO_DB_NAME: remsadmin2
       MONGO_URL: mongodb://rems-user2:pass@pims_remsadmin_mongo:27017
       SERVER_NAME: 'CodeX REMS Administrator Prototype #2'
       PORT: 8095
+      FRONTEND_PORT: 9095
+      AUTH_SERVER_URI: 'http://localhost:8095'
+      RESOURCE_SERVER: 'http://localhost:8095'
     depends_on:
       pims_remsadmin_mongo:
         condition: service_healthy
@@ -132,6 +139,7 @@ services:
       REMS_ADMIN_FHIR_PATH: http://rems-administrator:8090/4_0_0
     ports:
       - "3003:3003"
+      - "9080:9080"
     depends_on:
       pims_remsadmin_mongo:
         condition: service_healthy

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -49,6 +49,7 @@ services:
     container_name: rems_prod_rems-administrator
     ports: # Port binding to host from docker container
       - "8090:8090"
+      - "9090:9090"
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
       MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
@@ -62,12 +63,16 @@ services:
     container_name: rems_prod_rems-administrator2
     ports: # Port binding to host from docker container
       - "8095:8095"
+      - "9095:9095"
     environment:
       VSAC_API_KEY: ${VSAC_API_KEY}
       MONGO_DB_NAME: remsadmin2
       MONGO_URL: mongodb://rems-user2:pass@pims_remsadmin_mongo:27017
       SERVER_NAME: 'CodeX REMS Administrator Prototype #2'
       PORT: 8095
+      FRONTEND_PORT: 9095
+      AUTH_SERVER_URI: 'http://localhost:8095'
+      RESOURCE_SERVER: 'http://localhost:8095'
     depends_on:
       pims_remsadmin_mongo:
         condition: service_healthy
@@ -119,6 +124,7 @@ services:
       REMS_ADMIN_FHIR_PATH: http://rems-administrator:8090/4_0_0
     ports:
       - "3003:3003"
+      - "9080:9080"
     depends_on:
       pims_remsadmin_mongo:
         condition: service_healthy

diff --git a/docker-sync.yml b/docker-sync.yml
@@ -17,11 +17,11 @@ syncs:
 
   rems_dev_rems-admin-sync:
     src: '../rems-admin'
-    sync_excludes: ['node_modules']
+    sync_excludes: ['node_modules', './frontend/node_modules']
 
   rems_dev_rems-admin2-sync:
     src: '../rems-admin'
-    sync_excludes: ['node_modules']
+    sync_excludes: ['node_modules', './frontend/node_modules']
 
 
   rems_dev_pims-sync:  
@@ -30,4 +30,4 @@ syncs:
 
   rems_dev_rems-intermediary-sync:
     src: '../rems-intermediary'
-    sync_excludes: ['node_modules']
+    sync_excludes: ['node_modules', './frontend/node_modules']