Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 1 deletion REMS.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,8 @@
"Winterfell",
"Wiseman",
"zoneinfo"
]
],
"java.compile.nullAnalysis.mode": "automatic"
},
"extensions": {
"recommendations": [
Expand Down
21 changes: 21 additions & 0 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,23 @@ services:
- rems_dev_rems-admin-nodeModules:/rems-admin/node_modules
- rems_dev_rems-admin-logs:/rems-admin/logs

rems-administrator2:
build:
context: '../rems-admin'
dockerfile: Dockerfile.dev
container_name: rems_dev_rems-administrator2
ports:
- "8095:8095"
- "8096:8096"
environment:
VSAC_API_KEY: ${VSAC_API_KEY}
MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
PORT: 8095
volumes:
- rems_dev_rems-admin2-sync:/rems-admin2:nocopy # nocopy is important
- rems_dev_rems-admin2-nodeModules:/rems-admin2/node_modules
- rems_dev_rems-admin2-logs:/rems-admin2/logs

pims:
build:
context: ../pims
Expand Down Expand Up @@ -131,6 +148,8 @@ volumes:
external: true
rems_dev_rems-admin-sync:
external: true
rems_dev_rems-admin2-sync:
external: true
rems_dev_pims-sync:
external: true
rems_dev_rems-smart-on-fhir-sync:
Expand All @@ -155,6 +174,8 @@ volumes:
rems_dev_pims-backend-dist:
rems_dev_rems-admin-nodeModules:
rems_dev_rems-admin-logs:
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-intermediary-nodeModules:
Expand Down
12 changes: 12 additions & 0 deletions docker-compose-local-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,18 @@ services:
VSAC_API_KEY: ${VSAC_API_KEY}
MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017

rems-administrator2:
build:
context: '../rems-admin'
container_name: rems_dev_rems-administrator2
ports:
- "8095:8095"
- "8096:8096"
environment:
VSAC_API_KEY: ${VSAC_API_KEY}
MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
PORT: 8095

pims:
build:
context: ../pims
Expand Down
12 changes: 11 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,23 @@ services:
# Create rems container
rems-administrator: # Name of our service
image: codexrems/rems-administrator:1.1
container_name: rems_prod_rems
container_name: rems_prod_rems-administrator
ports: # Port binding to host from docker container
- "8090:8090"
environment:
VSAC_API_KEY: ${VSAC_API_KEY}
MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017

rems-administrator2: # Name of our service
image: codexrems/rems-administrator:1.1
container_name: rems_prod_rems-administrator2
ports: # Port binding to host from docker container
- "8095:8095"
environment:
VSAC_API_KEY: ${VSAC_API_KEY}
MONGO_URL: mongodb://rems-user:pass@pims_remsadmin_mongo:27017
PORT: 8095

# Create pims admin container
pims_remsadmin_mongo:
image: mongo
Expand Down
5 changes: 5 additions & 0 deletions docker-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ syncs:
src: '../rems-admin'
sync_excludes: ['node_modules']

rems_dev_rems-admin2-sync:
src: '../rems-admin'
sync_excludes: ['node_modules']


rems_dev_pims-sync:
src: '../pims'
sync_excludes: ['./frontend/node_modules', './backend/node_modules', './backend/dist']
Expand Down