Merge pull request #107 from kids-first/fix-dashboard-launch

🐛 Add missing env vars to Docker Compose
kids-first · Aug 7, 2020 · 4c66efd · 4c66efd
2 parents d43d808 + b5c1b2c
commit 4c66efd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git 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
 

diff --git 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=Localhost
+        - REACT_APP_FHIR_API_AUTH_TYPE=BASIC_AUTH
+        - REACT_APP_FHIR_API=http://localhost:8000
     ports:
       - "3000:80"