debugging dockerfile

alan-turing-institute · Sep 17, 2024 · c72439b · c72439b
1 parent 4a88e42
commit c72439b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/frontend-docker.yaml b/.github/workflows/frontend-docker.yaml
@@ -36,7 +36,7 @@ jobs:
             --build-arg GITHUB_APP_CLIENT_SECRET=${{ secrets.GH_APP_CLIENT_SECRET }} \
             --build-arg NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET }} \
             --build-arg NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }} \
-            --build-arg API_URL=${{ secrets.NEXT_PUBLIC_API_URL }} \
+            --build-arg API_URL=https://eap-backend.azurewebsites.net/ \
             --build-arg NEXTAUTH_URL=${{ secrets.NEXTAUTH_URL }} \
             -t turingassuranceplatform/eap_frontend:main \
             -t turingassuranceplatform/eap_frontend:${{ env.commit_date }}.${{ env.sha_short }} \
@@ -52,7 +52,7 @@ jobs:
             --build-arg GITHUB_APP_CLIENT_SECRET=${{ secrets.GH_APP_CLIENT_SECRET_STAGING }} \
             --build-arg NEXTAUTH_SECRET=${{ secrets.NEXTAUTH_SECRET_STAGING }} \
             --build-arg NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL_STAGING }} \
-            --build-arg API_URL=${{ secrets.NEXT_PUBLIC_API_URL_STAGING }} \
+            --build-arg API_URL=https://staging-eap-backend.azurewebsites.net/ \
             --build-arg NEXTAUTH_URL=${{ secrets.NEXT_PUBLIC_API_URL_STAGING }} \
             -t turingassuranceplatform/eap_frontend:develop \
             -t turingassuranceplatform/eap_frontend:${{ env.commit_date }}.${{ env.sha_short }}\

diff --git a/next_frontend/docker/staging/Dockerfile b/next_frontend/docker/staging/Dockerfile
@@ -66,6 +66,7 @@ ENV GITHUB_APP_CLIENT_ID=${GITHUB_APP_CLIENT_ID}
 ENV GITHUB_APP_CLIENT_SECRET=${GITHUB_APP_CLIENT_SECRET}
 ENV NEXTAUTH_SECRET=${NEXTAUTH_SECRET}
 ENV NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}
+ENV API_URL=${API_URL}
 ENV NEXTAUTH_URL=${NEXTAUTH_URL}
 
 USER nextjs

diff --git a/next_frontend/docker/staging/docker-compose.yml b/next_frontend/docker/staging/docker-compose.yml
@@ -11,14 +11,14 @@ services:
         GITHUB_APP_CLIENT_SECRET: ${GITHUB_APP_CLIENT_SECRET}
         NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
         NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-        API_URL: ${NEXT_PUBLIC_API_URL}
+        API_URL: ${API_URL}
         NEXTAUTH_URL: ${NEXTAUTH_URL}
     environment:
       GITHUB_APP_CLIENT_ID: ${GITHUB_APP_CLIENT_ID}
       GITHUB_APP_CLIENT_SECRET: ${GITHUB_APP_CLIENT_SECRET}
       NEXTAUTH_SECRET: ${NEXTAUTH_SECRET}
       NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}
-      API_URL: ${NEXT_PUBLIC_API_URL}
+      API_URL: ${API_URL}
       NEXTAUTH_URL: ${NEXTAUTH_URL}
     ports:
       - "3000:3000"