From cf8acbd8669b7ed85fe267dc8d4e195c58242907 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Fri, 11 Aug 2023 10:24:46 -0400 Subject: [PATCH 1/2] update docker sync configs for pims hot reload --- .gitignore | 1 + docker-compose-dev.yml | 20 +++++++------------- docker-sync.yml | 10 +++++----- 3 files changed, 13 insertions(+), 18 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4c49bd7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.env diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 766dbad..86d4428 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -32,7 +32,6 @@ services: - rems_dev_test-ehr-bin:/test-ehr/bin - rems_dev_test-ehr-build:/test-ehr/build - rems_dev_test-ehr-target:/test-ehr/target - - rems_dev_test-ehr-logs:/test-ehr/logs extra_hosts: - "host.docker.internal:host-gateway" @@ -63,7 +62,6 @@ services: - rems_dev_crd-request-generator-nodeModules:/home/node/app/crd-request-generator/node_modules - rems_dev_crd-request-generator-databaseData:/home/node/app/crd-request-generator/databaseData - rems_dev_crd-request-generator-build:/home/node/app/crd-request-generator/build - - rems_dev_crd-request-generator-logs:/home/node/app/crd-request-generator/logs rems-smart-on-fhir: build: @@ -76,7 +74,6 @@ services: volumes: - 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_dev_rems-smart-on-fhir-logs:/home/node/app/rems-smart-on-fhir/logs rems-administrator: build: @@ -92,7 +89,6 @@ services: volumes: - rems_dev_rems-sync:/REMS:nocopy # nocopy is important - rems_dev_rems-nodeModules:/REMS/node_modules - - rems_dev_rems-logs:/REMS/logs pims: build: @@ -106,9 +102,10 @@ services: REMS_ADMIN_BASE: http://rems-administrator:8090 MONGO_URL: mongodb://pims_remsadmin_mongo:27017/pims volumes: - - rems_dev_pims-sync:/home/node/app/pims:nocopy - - rems_dev_pims-nodeModules:/home/node/app/pims/node_modules - - rems_dev_pims-logs:/home/node/app/pims/logs + - rems_dev_pims-sync:/home/node/app:nocopy + - rems_dev_pims-nodeModules:/home/node/app/frontend/node_modules + - rems_dev_pims-backend-nodeModules:/home/node/app/backend/node_modules + - rems_dev_pims-backend-dist:/home/node/app/backend/dist volumes: rems_dev_test-ehr-sync: @@ -128,15 +125,12 @@ volumes: rems_dev_test-ehr-bin: rems_dev_test-ehr-build: rems_dev_test-ehr-target: - rems_dev_test-ehr-logs: rems_dev_crd-resources-build: rems_dev_crd-request-generator-nodeModules: rems_dev_crd-request-generator-databaseData: rems_dev_crd-request-generator-build: - rems_dev_crd-request-generator-logs: - rems_dev_pims-logs: rems_dev_pims-nodeModules: + rems_dev_pims-backend-nodeModules: + rems_dev_pims-backend-dist: rems_dev_rems-nodeModules: - rems_dev_rems-logs: - rems_dev_rems-smart-on-fhir-nodeModules: - rems_dev_rems-smart-on-fhir-logs: \ No newline at end of file + rems_dev_rems-smart-on-fhir-nodeModules: \ No newline at end of file diff --git a/docker-sync.yml b/docker-sync.yml index 15fd2de..114afb5 100644 --- a/docker-sync.yml +++ b/docker-sync.yml @@ -4,20 +4,20 @@ options: syncs: rems_dev_test-ehr-sync: src: ../test-ehr - sync_excludes: ['.gradle', 'bin', 'build', 'target', 'logs'] + sync_excludes: ['./.gradle', './bin', './build', './target'] rems_dev_crd-request-generator-sync: src: '../crd-request-generator' - sync_excludes: ['node_modules', 'build', 'databaseData', 'logs'] + sync_excludes: ['./node_modules', './build', './databaseData'] rems_dev_rems-smart-on-fhir-sync: src: '../rems-smart-on-fhir' - sync_excludes: ['node_modules', 'logs'] + sync_excludes: ['./node_modules'] rems_dev_rems-sync: src: '../REMS' - sync_excludes: ['node_modules', 'logs'] + sync_excludes: ['./node_modules', ./coverage] rems_dev_pims-sync: src: '../pims' - sync_excludes: ['node_modules', 'logs'] \ No newline at end of file + sync_excludes: ['./frontend/node_modules', './backend/node_modules', './backend/dist'] \ No newline at end of file From 66bc2bfad4b6061682d9b743a3c9d50c3f7463ed Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Fri, 11 Aug 2023 11:22:41 -0400 Subject: [PATCH 2/2] add .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4c49bd7..2eea525 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.env +.env \ No newline at end of file