diff --git a/.gitignore b/.gitignore index 11ee758..118b759 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ +.env .env.local + diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index dfd0b94..49a2c16 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" @@ -76,7 +75,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: @@ -106,9 +104,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,7 +127,6 @@ 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_request-generator-nodeModules: rems_dev_request-generator-databaseData: @@ -136,7 +134,10 @@ volumes: rems_dev_request-generator-logs: rems_dev_pims-logs: rems_dev_pims-nodeModules: + rems_dev_pims-backend-nodeModules: + rems_dev_pims-backend-dist: rems_dev_rems-admin-nodeModules: rems_dev_rems-admin-logs: rems_dev_rems-smart-on-fhir-nodeModules: rems_dev_rems-smart-on-fhir-logs: + diff --git a/docker-sync.yml b/docker-sync.yml index 5bd0efe..d271cf7 100644 --- a/docker-sync.yml +++ b/docker-sync.yml @@ -4,20 +4,21 @@ 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_request-generator-sync: src: '../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-admin-sync: src: '../rems-admin' - sync_excludes: ['node_modules', 'logs'] + sync_excludes: ['node_modules'] 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