Merge pull request #136 from CS3219-AY2425S1/cloud-fix

add env variable to fe

Author: Kurtyjlee

.github/workflows/deploy.yml

@@ -50,9 +50,10 @@ jobs:
           NEXT_PUBLIC_API_GATEWAY_URL: ${{ secrets.NEXT_PUBLIC_API_GATEWAY_URL }}
           NEXT_PUBLIC_GITHUB_CLIENT_ID: ${{ secrets.NEXT_PUBLIC_GITHUB_CLIENT_ID }}
           NEXT_PUBLIC_SOCK_SERVER_URL: ${{ secrets.NEXT_PUBLIC_SOCK_SERVER_URL }}
+          NEXT_PUBLIC_AUDIO_SERVER_URL: ${{ secrets.NEXT_PUBLIC_AUDIO_SERVER_URL }}
         run: |
           gcloud builds submit --config cloudbuilds/fe.yaml \
-            --substitutions _NEXT_PUBLIC_API_GATEWAY_URL="$NEXT_PUBLIC_API_GATEWAY_URL",_NEXT_PUBLIC_GITHUB_CLIENT_ID="$NEXT_PUBLIC_GITHUB_CLIENT_ID",_NEXT_PUBLIC_SOCK_SERVER_URL="$NEXT_PUBLIC_SOCK_SERVER_URL"
+            --substitutions _NEXT_PUBLIC_API_GATEWAY_URL="$NEXT_PUBLIC_API_GATEWAY_URL",_NEXT_PUBLIC_GITHUB_CLIENT_ID="$NEXT_PUBLIC_GITHUB_CLIENT_ID",_NEXT_PUBLIC_SOCK_SERVER_URL="$NEXT_PUBLIC_SOCK_SERVER_URL",_NEXT_PUBLIC_AUDIO_SERVER_URL="$NEXT_PUBLIC_AUDIO_SERVER_URL"
 
   deploy-api-gateway:
     needs: check-changes

cloudbuilds/fe.yaml

@@ -14,6 +14,8 @@ steps:
         "NEXT_PUBLIC_GITHUB_CLIENT_ID=${_NEXT_PUBLIC_GITHUB_CLIENT_ID}",
         "--build-arg",
         "NEXT_PUBLIC_SOCK_SERVER_URL=${_NEXT_PUBLIC_SOCK_SERVER_URL}",
+        "--build-arg",
+        "NEXT_PUBLIC_AUDIO_SERVER_URL=${_NEXT_PUBLIC_AUDIO_SERVER_URL}",
         "-f",
         "peerprep-fe/Dockerfile",
         "peerprep-fe",
@@ -55,6 +57,7 @@ substitutions:
   _NEXT_PUBLIC_API_GATEWAY_URL: ""
   _NEXT_PUBLIC_GITHUB_CLIENT_ID: ""
   _NEXT_PUBLIC_SOCK_SERVER_URL: ""
+  _NEXT_PUBLIC_AUDIO_SERVER_URL: ""
 
 options:
   dynamic_substitutions: true

k8s/peerprep-config.yml

@@ -7,4 +7,5 @@ stringData:
   NEXT_PUBLIC_API_GATEWAY_URL: "${_NEXT_PUBLIC_API_GATEWAY_URL}"
   NEXT_PUBLIC_GITHUB_CLIENT_ID: "${_NEXT_PUBLIC_GITHUB_CLIENT_ID}"
   NEXT_PUBLIC_SOCK_SERVER_URL: "${_NEXT_PUBLIC_SOCK_SERVER_URL}"
+  NEXT_PUBLIC_AUDIO_SERVER_URL: "${_NEXT_PUBLIC_AUDIO_SERVER_URL}"
   # Removed individual service URLs as they are no longer needed

k8s/session-service.yml

@@ -39,7 +39,7 @@ kind: Service
 metadata:
   name: session-svc
 spec:
-  type: ClusterIP
+  type: LoadBalancer
   ports:
     - name: port-4444
       port: 4444

peerprep-fe/Dockerfile

@@ -33,11 +33,13 @@ ENV PORT=3000
 ARG NEXT_PUBLIC_API_GATEWAY_URL
 ARG NEXT_PUBLIC_GITHUB_CLIENT_ID
 ARG NEXT_PUBLIC_SOCK_SERVER_URL
+ARG NEXT_PUBLIC_AUDIO_SERVER_URL
 
 # Set environment variable
 ENV NEXT_PUBLIC_API_GATEWAY_URL=$NEXT_PUBLIC_API_GATEWAY_URL
 ENV NEXT_PUBLIC_GITHUB_CLIENT_ID=$NEXT_PUBLIC_GITHUB_CLIENT_ID
 ENV NEXT_PUBLIC_SOCK_SERVER_URL=$NEXT_PUBLIC_SOCK_SERVER_URL
+ENV NEXT_PUBLIC_AUDIO_SERVER_URL=$NEXT_PUBLIC_AUDIO_SERVER_URL
 
 COPY . .
 RUN pnpm build

session-service/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "dev": "concurrently \"nodemon --exec ts-node src/audio-service.ts\" \"nodemon --exec ts-node src/server.ts\"",
-    "start": "tsc && node dist/server.js && node dist/audio-service.js",
+    "start": "concurrently \"node dist/server.js\" \"node dist/audio-service.js\"",
     "build": "tsc && echo \"Build completed successfully.\"",
     "format": "prettier --write \"src/**/*.ts\"",
     "pre-commit": "pnpm format && git add -u",