Merge branch 'develop' into dc-aws-deployment

ga4gh · Sep 10, 2024 · eff44cc · eff44cc
2 parents 01463a3 + 3647ff2
commit eff44cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.env.development b/.env.development
@@ -1,3 +1,3 @@
 REACT_APP_DEPLOYMENT_ENV=Development
 REACT_APP_TESTBED_API_BASE_URL=http://localhost
-REACT_APP_TESTBED_API_BASE_PORT=4500
+REACT_APP_TESTBED_API_BASE_PORT=4500
diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +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.development
-COPY .env.production .env.production
+COPY ${ENV_FILE_PATH} .env
 COPY public public
 COPY src src
 #RUN npm run reactBuild