Skip to content

Dev #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smalho01 merged 3 commits into from
Mar 31, 2025
Merged

Dev #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ce8ac9
directory updates
smalho01 Mar 27, 2025
e7b7a24
docker env
smalho01 Mar 27, 2025
b548228
Merge pull request #79 from mcode/dockerize-directory
plarocque4 Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions REMS.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
},
{
"path": "../rems-intermediary"
},
{
"path": "../rems-directory"
}
],
"launch": {
Expand Down
22 changes: 21 additions & 1 deletion docker-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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"
Expand All @@ -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

Expand All @@ -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:

14 changes: 14 additions & 0 deletions docker-compose-local-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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"
Expand Down
13 changes: 13 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion docker-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
Loading