From 2392976e2d6874d3fd0ff899e42bd0f09c958714 Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Thu, 13 Jan 2022 12:01:53 -0500 Subject: [PATCH 1/2] ignore .env file --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 86f4bdf7..f3c5b837 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .cnab/ .docker-sync/ -Zscaler_Root_CA.pem \ No newline at end of file +Zscaler_Root_CA.pem +.env \ No newline at end of file From ab92292d7f0cbdf99d3c3703fc708797722bbada Mon Sep 17 00:00:00 2001 From: Sahil Malhotra Date: Fri, 21 Jan 2022 13:04:15 -0500 Subject: [PATCH 2/2] pms system configs --- .gitignore | 1 - REMS.code-workspace | 5 ++++- docker-compose-dev.yml | 17 +++++++++++++++++ docker-compose-porter.yml | 10 +++++++++- docker-compose.yml | 10 +++++++++- docker-sync.yml | 6 +++++- 6 files changed, 44 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f3c5b837..3688cc0c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .cnab/ .docker-sync/ -Zscaler_Root_CA.pem .env \ No newline at end of file diff --git a/REMS.code-workspace b/REMS.code-workspace index e289dfc2..520c4ca3 100644 --- a/REMS.code-workspace +++ b/REMS.code-workspace @@ -5,7 +5,7 @@ }, { "name": "CRD-CDS-Library", - "path": "../CRD/server/CDS-Library" + "path": "../CRD/server/CDS-Library" }, { "path": "../CRD" @@ -18,6 +18,9 @@ }, { "path": "." + }, + { + "path": "../pharmacy-information-system" } ] } \ No newline at end of file diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 3af7639e..3cf23335 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -90,6 +90,21 @@ services: volumes: - rems_dev_rems-sync:/REMS:nocopy # nocopy is important + pharmacy-information-system: # Name of our service + build: + context: ../pharmacy-information-system + dockerfile: Dockerfile.dev + container_name: rems_dev_pharmacy-information-system + environment: + - PORT=3010 + ports: # Port binding to host from docker container + - "4200:4200" + - "3010:3010" + volumes: + - rems_dev_pharmacy-information-system-sync:/home/node/app:nocopy # nocopy is important + - /home/node/app/node_modules + - /home/node/app/backend/node_modules + volumes: keycloak-data: rems_dev_test-ehr-sync: @@ -101,4 +116,6 @@ volumes: rems_dev_dtr-sync: external: true rems_dev_rems-sync: + external: true + rems_dev_pharmacy-information-system-sync: external: true \ No newline at end of file diff --git a/docker-compose-porter.yml b/docker-compose-porter.yml index e0f78d22..78934ae8 100644 --- a/docker-compose-porter.yml +++ b/docker-compose-porter.yml @@ -60,7 +60,15 @@ services: ports: # Port binding to host from docker container - "9015:9015" # Bind port 3000 of host to 3000 of container - + pharmacy-information-system: # Name of our service + build: + image: codexrems/pharmacy-information-system + container_name: rems_porter_pharmacy-information-system + environment: + - PORT=3010 + ports: # Port binding to host from docker container + - "4200:4200" + - "3010:3010" volumes: keycloak-data: diff --git a/docker-compose.yml b/docker-compose.yml index dc373a77..5effbacb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -60,7 +60,15 @@ services: ports: # Port binding to host from docker container - "9015:9015" # Bind port 3000 of host to 3000 of container - + pharmacy-information-system: # Name of our service + build: + image: codexrems/pharmacy-information-system + container_name: rems_porter_pharmacy-information-system + environment: + - PORT=3010 + ports: # Port binding to host from docker container + - "4200:4200" + - "3010:3010" volumes: keycloak-data: diff --git a/docker-sync.yml b/docker-sync.yml index 80aa060a..14538c4d 100644 --- a/docker-sync.yml +++ b/docker-sync.yml @@ -19,4 +19,8 @@ syncs: sync_excludes: ['node_modules', 'databaseData'] rems_dev_rems-sync: - src: '.' \ No newline at end of file + src: '.' + + rems_dev_pharmacy-information-system-sync: + src: '../pharmacy-information-system' + sync_excludes: ['node_modules', 'backend/node_modules'] \ No newline at end of file