Merge pull request #80 from mcode/dev

Dev

Author: smalho01

REMS.code-workspace

@@ -20,6 +20,9 @@
     },
     {
       "path": "../rems-intermediary"
+    },
+    {
+      "path": "../rems-directory"
     }
   ],
   "launch": {

docker-compose-dev.yml

@@ -86,6 +86,22 @@ services:
       - rems_dev_rems-smart-on-fhir-sync:/home/node/app/rems-smart-on-fhir:nocopy #  nocopy is important
       - rems_dev_rems-smart-on-fhir-nodeModules:/home/node/app/rems-smart-on-fhir/node_modules
 
+  rems-directory:
+    build:
+      context: ../rems-directory
+      dockerfile: Dockerfile.dev
+    container_name: rems_dev_rems-directory
+    ports:
+      - "3323:3323"
+      - "3324:3324"
+    environment:
+      REMS_ADMIN_1_URL: http://rems-administrator:8090/
+      REMS_ADMIN_2_URL: http://rems-administrator2:8095/
+      SPL_ZIP_PATH: /src/spl/TESTDATA_Docker_rems_document_and_rems_indexing_spl_files.zip
+    volumes:
+      - rems_dev_rems-directory-sync:/home/node/app/rems-directory:nocopy #  nocopy is important
+      - rems_dev_rems-directory-nodeModules:/home/node/app/rems-directory/node_modules
+
   rems-administrator:
     build:
       context: '../rems-admin'
@@ -174,6 +190,8 @@ services:
       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
+      DIRECTORY_SERVICE_URL: http://rems-directory:3323
+      SPL_ZIP_FILE_NAME: TESTDATA_Docker_rems_document_and_rems_indexing_spl_files.zip
     ports:
       - "3003:3003"
       - "9080:9080"
@@ -198,6 +216,8 @@ volumes:
     external: true
   rems_dev_rems-smart-on-fhir-sync:
     external: true
+  rems_dev_rems-directory-sync:
+    external: true
   rems_dev_rems-intermediary-sync:
     external: true
 
@@ -221,7 +241,7 @@ volumes:
   rems_dev_rems-admin2-nodeModules:
   rems_dev_rems-admin2-logs:
   rems_dev_rems-smart-on-fhir-nodeModules:
-  rems_dev_rems-smart-on-fhir-logs:
+  rems_dev_rems-directory-nodeModules:
   rems_dev_rems-intermediary-nodeModules:
   rems_dev_rems-intermediary-logs:
 

docker-compose-local-build.yml

@@ -68,6 +68,18 @@ services:
       - "4040:4040"
       - "4041:4041"
 
+  rems-directory:
+    build:
+      context: ../rems-directory
+    container_name: rems_dev_rems-directory
+    ports:
+      - "3323:3323"
+      - "3324:4424"
+    environment:
+      REMS_ADMIN_1_URL: http://rems-administrator:8090/
+      REMS_ADMIN_2_URL: http://rems-administrator2:8095/
+      SPL_ZIP_PATH: /src/spl/TESTDATA_Docker_rems_document_and_rems_indexing_spl_files.zip
+
   rems-administrator:
     build:
       context: '../rems-admin'
@@ -137,6 +149,8 @@ services:
       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
+      DIRECTORY_SERVICE_URL: http://rems-directory:3323
+      SPL_ZIP_FILE_NAME: TESTDATA_Docker_rems_document_and_rems_indexing_spl_files.zip
     ports:
       - "3003:3003"
       - "9080:9080"

docker-compose.yml

@@ -43,6 +43,17 @@ services:
     ports:
       - "4040:4040"
 
+  rems-directory:
+    build:
+      image: codexrems/rems-directory:1.3
+    container_name: rems_prod_rems-directory
+    ports:
+      - "3323:3323"
+    environment:
+      REMS_ADMIN_1_URL: http://rems-administrator:8090/
+      REMS_ADMIN_2_URL: http://rems-administrator2:8095/
+      SPL_ZIP_PATH: /src/spl/TESTDATA_Docker_rems_document_and_rems_indexing_spl_files.zip
+
   # Create rems container
   rems-administrator: # Name of our service
     image: codexrems/rems-administrator:1.2
@@ -122,6 +133,8 @@ services:
       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
+      DIRECTORY_SERVICE_URL: http://rems-directory:3323
+      SPL_ZIP_FILE_NAME: TESTDATA_Docker_rems_document_and_rems_indexing_spl_files.zip
     ports:
       - "3003:3003"
       - "9080:9080"

docker-sync.yml

@@ -10,11 +10,14 @@ syncs:
     src: '../request-generator'
     sync_excludes: ['node_modules', 'build', 'databaseData']
 
-
   rems_dev_rems-smart-on-fhir-sync:  
     src: '../rems-smart-on-fhir'
     sync_excludes: ['node_modules']
 
+  rems_dev_rems-directory-sync:  
+    src: '../rems-directory'
+    sync_excludes: ['node_modules']
+
   rems_dev_rems-admin-sync:
     src: '../rems-admin'
     sync_excludes: ['node_modules', './frontend/node_modules']