Merge pull request #55 from CS3219-AY2425S1/fix/production-endpoints

Fix/production endpoints

Author: simbayippy

.github/workflows/deploy.yml

@@ -28,4 +28,9 @@ jobs:
         run: "gcloud info"
 
       - name: "Trigger Cloud Build"
-        run: "gcloud builds submit --config cloudbuild.yaml"
+        env:
+          NEXT_PUBLIC_QUESTION_SERVICE_URL: ${{ secrets.NEXT_PUBLIC_QUESTION_SERVICE_URL }}
+          NEXT_PUBLIC_AUTH_SERVICE_URL: ${{ secrets.NEXT_PUBLIC_AUTH_SERVICE_URL }}
+        run: |
+          gcloud builds submit --config cloudbuild.yaml \
+            --substitutions _NEXT_PUBLIC_QUESTION_SERVICE_URL=$NEXT_PUBLIC_QUESTION_SERVICE_URL,_NEXT_PUBLIC_AUTH_SERVICE_URL=$NEXT_PUBLIC_AUTH_SERVICE_URL

cloudbuild.yaml

@@ -8,6 +8,10 @@ steps:
         "build",
         "-t",
         "asia-southeast1-docker.pkg.dev/cs3219-g11-peerprep/cs3219-g11-repo/peerprep-fe:latest",
+        "--build-arg",
+        "NEXT_PUBLIC_QUESTION_SERVICE_URL=${_NEXT_PUBLIC_QUESTION_SERVICE_URL}",
+        "--build-arg",
+        "NEXT_PUBLIC_AUTH_SERVICE_URL=${_NEXT_PUBLIC_AUTH_SERVICE_URL}",
         "-f",
         "peerprep-fe/Dockerfile",
         "peerprep-fe",
@@ -137,6 +141,10 @@ steps:
       - "CLOUDSDK_COMPUTE_ZONE=asia-southeast1"
       - "CLOUDSDK_CONTAINER_CLUSTER=cs3219-g11-peerprep-kubes"
 
+substitutions:
+  _NEXT_PUBLIC_QUESTION_SERVICE_URL: ""
+  _NEXT_PUBLIC_AUTH_SERVICE_URL: ""
+
 options:
   dynamic_substitutions: true
 

k8s/peerprep-config.yml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: peerprep-config
+type: Opaque
+stringData:
+  NEXT_PUBLIC_QUESTION_SERVICE_URL: "${_NEXT_PUBLIC_QUESTION_SERVICE_URL}"
+  NEXT_PUBLIC_AUTH_SERVICE_URL: "${_NEXT_PUBLIC_AUTH_SERVICE_URL}"

peerprep-fe/Dockerfile

@@ -30,6 +30,14 @@ FROM base AS production
 ENV NODE_ENV=production
 ENV PORT=3000
 
+# Accept build arguments
+ARG NEXT_PUBLIC_QUESTION_SERVICE_URL
+ARG NEXT_PUBLIC_AUTH_SERVICE_URL
+
+# Set environment variables
+ENV NEXT_PUBLIC_QUESTION_SERVICE_URL=$NEXT_PUBLIC_QUESTION_SERVICE_URL
+ENV NEXT_PUBLIC_AUTH_SERVICE_URL=$NEXT_PUBLIC_AUTH_SERVICE_URL
+
 COPY . .
 RUN pnpm build