From d9a8fed6e514e65597433379ec80c7e437a5d7d5 Mon Sep 17 00:00:00 2001
From: Deeptha Srirangam <deeptha.srirangam@ga4gh.org>
Date: Fri, 6 Sep 2024 16:50:05 -0400
Subject: [PATCH 1/2] updated docker env for local development

---
 .env.development | 2 +-
 Dockerfile       | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index c1f9b10..460988a 100644
--- a/.env.development
+++ b/.env.development
@@ -1,3 +1,3 @@
 REACT_APP_DEPLOYMENT_ENV=Development
-REACT_APP_TESTBED_API_BASE_URL=http://dev-testbed.ga4gh.org
+REACT_APP_TESTBED_API_BASE_URL=http://localhost
 REACT_APP_TESTBED_API_BASE_PORT=4500
diff --git a/Dockerfile b/Dockerfile
index d2aa593..9d141b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,19 @@
-# Dockerfile for Connect April 2022 demo
+# Dockerfile for local development
 # UI pulls data from from testbed api in local docker-compose network
 
 # Builder
 FROM node:16.13.2-alpine3.15 as builder
 WORKDIR /app
+
+ARG ENV_FILE_PATH=.env.development
+
 ENV PATH /app/node_modules/.bin:$PATH
 
 COPY package.json package.json
 COPY package-lock.json package-lock.json
 RUN npm install
 
-COPY .env.development .env.production
+COPY ${ENV_FILE_PATH} .env
 COPY public public
 COPY src src
 RUN npm run reactBuild

From e47deba26bd0f0debe52918659c700794b7b7f5d Mon Sep 17 00:00:00 2001
From: Deeptha Srirangam <deeptha.srirangam@ga4gh.org>
Date: Mon, 9 Sep 2024 10:36:23 -0400
Subject: [PATCH 2/2] fix docker-compose run command

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 258d62c..8e57d20 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,4 +34,4 @@ jobs:
           cache-to: type=gha,mode=max
 
       - name: Start Services
-        run: docker-compose up -d
+        run: docker compose up -d