From d00a80691e13d746b95445303e80a44e9f8b4cdc Mon Sep 17 00:00:00 2001 From: Natasha Singh Date: Thu, 6 Aug 2020 21:36:06 -0400 Subject: [PATCH 1/3] :fire: Don't build/push kidsfirst demo image --- .circleci/config.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a4dbdef..caeabf4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,15 +20,6 @@ jobs: docker build -t "kidsfirstdrc/kf-ui-fhir-data-dashboard:dev" \ -t "kidsfirstdrc/kf-ui-fhir-data-dashboard:latest" . - - run: - name: Build docker kidsfirst image - command: | - if [ $CIRCLE_BRANCH == 'master' ]; then - docker build \ - --build-arg REACT_APP_FHIR_API_NAME="Kids First" \ - --build-arg REACT_APP_FHIR_API="http://10.10.1.141:8000/" \ - -t "kidsfirstdrc/kf-ui-fhir-data-dashboard:kidsfirst" . - fi - run: name: 'Push docker images' command: | @@ -39,7 +30,6 @@ jobs: kidsfirstdrc/kf-ui-fhir-data-dashboard:$GIT_COMMIT docker push kidsfirstdrc/kf-ui-fhir-data-dashboard:dev docker push kidsfirstdrc/kf-ui-fhir-data-dashboard:latest - docker push kidsfirstdrc/kf-ui-fhir-data-dashboard:kidsfirst docker push kidsfirstdrc/kf-ui-fhir-data-dashboard:$GIT_COMMIT fi From 342e01e66005752170303250c617a9d5a25e3137 Mon Sep 17 00:00:00 2001 From: Natasha Singh Date: Thu, 6 Aug 2020 21:36:44 -0400 Subject: [PATCH 2/3] :whale: Launch local dashboard with local FHIR server --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 521850c..0dc8d66 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,9 +4,9 @@ services: container_name: dashboard build: context: '.' - args: - - REACT_APP_FHIR_API_NAME=my-fhir-server - - REACT_APP_FHIR_API_AUTH_TYPE=BASIC_AUTH - - REACT_APP_FHIR_API=http://localhost:8000 + environment: + - REACT_APP_FHIR_API_NAME=my-fhir-server + - REACT_APP_FHIR_API_AUTH_TYPE=BASIC_AUTH + - REACT_APP_FHIR_API=http://localhost:8000 ports: - "3000:80" From b5c1b2c87eeb179997698c8e69e7a2bc2ce1385c Mon Sep 17 00:00:00 2001 From: Natasha Singh Date: Thu, 6 Aug 2020 21:36:44 -0400 Subject: [PATCH 3/3] :bug: Launch local dashboard with local FHIR server --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0dc8d66..f1ba969 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: build: context: '.' environment: - - REACT_APP_FHIR_API_NAME=my-fhir-server + - REACT_APP_FHIR_API_NAME=Localhost - REACT_APP_FHIR_API_AUTH_TYPE=BASIC_AUTH - REACT_APP_FHIR_API=http://localhost:8000 ports: