Merge branch 'main' into dev

alan-turing-institute · Apr 25, 2022 · 30b01d8 · 30b01d8
2 parents 0b7f45c + 4c5b0e0
commit 30b01d8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/frontend-docker.yaml b/.github/workflows/frontend-docker.yaml
@@ -19,11 +19,11 @@ jobs:
         if: ${{ github.ref == 'refs/heads/main' }}
         working-directory: frontend
         run: |
-          docker build -t turingassuranceplatform/eap_frontend:main -f Dockerfile .
+          docker build -t turingassuranceplatform/eap_frontend:main --build-arg BASE_URL="https://turing-assuranceplatform-backend.azurewebsites.net/api" -f Dockerfile .
           docker push turingassuranceplatform/eap_frontend:main
       - name: 'Build dev'
         if: ${{ github.ref == 'refs/heads/dev' }}
         working-directory: frontend
         run: |
-          docker build -t turingassuranceplatform/eap_frontend:dev -f Dockerfile .
+          docker build -t turingassuranceplatform/eap_frontend:dev --build-arg BASE_URL="https://turing-assuranceplatform-backend-dev.azurewebsites.net/api" -f Dockerfile .
           docker push turingassuranceplatform/eap_frontend:dev
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -1,5 +1,6 @@
 FROM node:16.14.2-slim
-ENV REACT_APP_BASE_URL="https://turing-assuranceplatform-backend.azurewebsites.net/api"
+ARG BASE_URL
+ENV REACT_APP_BASE_URL=$BASE_URL
 COPY . /frontend
 WORKDIR /frontend
 RUN npm install