Merge branch 'master' into 139/matching-svc-testing

Author: Nicholas-Cheng-De-Fei

.github/workflows/google-cloudrun-docker.yml

@@ -56,72 +56,128 @@ jobs:
         with:
           credentials_json: '${{ secrets.GCP_SA_KEY }}'
           project_id: ${{ secrets.GCP_PROJECT_ID }}
-          
+
       - name: Set up Cloud SDK
         uses: 'google-github-actions/setup-gcloud@v2'
-      
+
       - name: Configure Docker
         run: |
           gcloud auth configure-docker asia-southeast1-docker.pkg.dev
-      
-      - name: (AG) Build and Push Docker Image
-        working-directory: ./api-gateway
+
+      - name: (CS) Make Cloud Run build configuration changes
+        working-directory: ./collaboration-svc
         run: |
-          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-api-gateway:latest --platform=linux/amd64 .
-          docker push ${{ env.DOCKER_IMAGE_URL }}pp-api-gateway:latest
+          sed -i -e 's/EXPOSE 80/EXPOSE 8080/' -e 's/"--port", "80"/"--port", "8080"/' ./Dockerfile
 
       - name: (CS) Build and Push Docker Image
         working-directory: ./collaboration-svc
         run: |
           docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-collaboration-svc:latest --platform=linux/amd64 .
-          docker push ${{ env.DOCKER_IMAGE_URL }}pp-collaboration-svc:latest     
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-collaboration-svc:latest
 
       - name: (ES) Build and Push Docker Image
         working-directory: ./expire-observer-svc
         run: |
           docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-expire-observer-svc:latest --platform=linux/amd64 .
-          docker push ${{ env.DOCKER_IMAGE_URL }}pp-expire-observer-svc:latest 
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-expire-observer-svc:latest
 
-      - name: (MS) Build and Push Docker Image
-        working-directory: ./matching-svc
+      - name: (FE) Create .env for Cloud Run
+        working-directory: ./PeerPrep
         run: |
-          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-matching-svc:latest --platform=linux/amd64 .
-          docker push ${{ env.DOCKER_IMAGE_URL }}pp-matching-svc:latest
+          echo "VITE_API_URL=https://api.peerprep.cloud" > .env
+          echo "VITE_SIGNALING_SERVER_URL=wss://pp-ss-161940165499.asia-east1.run.app" >> .env
+          echo "VITE_ICE_SERVERS=stun:stun.l.google.com:19302" >> .env
+          echo "VITE_WS_GATEWAY_URL=wss://pp-api-gateway-161940165499.asia-east1.run.app/ws/fe" >> .env
+
+      - name: (FE) Make Cloud Run build configuration changes
+        working-directory: ./PeerPrep
+        run: |
+          sed -i 's/EXPOSE 80/EXPOSE 8080/' ./Dockerfile
+          sed -i 's/listen 80;/listen 8080;/' ./nginx.conf
+          sed -i 's/localhost/_/' ./nginx.conf
+
+      - name: (FE) Build and Push Docker Image
+        working-directory: ./PeerPrep
+        run: |
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-fe:latest --platform=linux/amd64 .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-fe:latest
+      
+      - name: (SS) Make Cloud Run build configuration changes
+        working-directory: ./signaling-svc
+        run: |
+          sed -i -e 's/EXPOSE 4444/EXPOSE 8080/' ./Dockerfile
+
+      - name: (SS) Build and Push Docker Image
+        working-directory: ./signaling-svc
+        run: |
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-ss:latest --platform=linux/amd64 .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-ss:latest
+
+      - name: (QHS) Make Cloud Run build configuration changes
+        working-directory: ./qns-hist-svc
+        run: |
+          sed -i -e 's/EXPOSE 80/EXPOSE 8080/' -e 's/"--port", "80"/"--port", "8080"/' ./Dockerfile
 
       - name: (QHS) Build and Push Docker Image
         working-directory: ./qns-hist-svc
         run: |
           docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-qns-hist-svc:latest --platform=linux/amd64 .
           docker push  ${{ env.DOCKER_IMAGE_URL }}pp-qns-hist-svc:latest
-      
-      - name: (QS) Build and Push Docker Image
-        working-directory: ./qns-svc
+
+      - name: (AG) Make Cloud Run build configuration changes
+        working-directory: ./api-gateway
         run: |
-          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-qns-svc:latest --platform=linux/amd64 .
-          docker push ${{ env.DOCKER_IMAGE_URL }}pp-qns-svc:latest
+          sed -i -e 's/EXPOSE 80/EXPOSE 8080/' -e 's/"--port", "80"/"--port", "8080"/' ./Dockerfile
+
+      - name: (AG) Build and Push Docker Image
+        working-directory: ./api-gateway
+        run: |
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-api-gateway:latest --platform=linux/amd64 .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-api-gateway:latest
+
+      - name: (MS) Make Cloud Run build configuration changes
+        working-directory: ./matching-svc
+        run: |
+          sed -i -e 's/EXPOSE 80/EXPOSE 8080/' -e 's/"--port", "80"/"--port", "8080"/' ./Dockerfile
+
+      - name: (MS) Build and Push Docker Image
+        working-directory: ./matching-svc
+        run: |
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-matching-svc:latest --platform=linux/amd64 .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-matching-svc:latest
+
+      - name: (US) Make Cloud Run build configuration changes
+        working-directory: ./user-svc
+        run: |
+          sed -i -e 's/EXPOSE 80/EXPOSE 8080/' -e 's/"--port", "80"/"--port", "8080"/' ./Dockerfile
 
       - name: (US) Build and Push Docker Image
         working-directory: ./user-svc
         run: |
           docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-user-svc:latest --platform=linux/amd64 .
           docker push ${{ env.DOCKER_IMAGE_URL }}pp-user-svc:latest
 
-      - name: (FE) Build and Push Docker Image
-        working-directory: ./PeerPrep
+      - name: (QS) Make Cloud Run build configuration changes
+        working-directory: ./qns-svc
         run: |
-          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-fe:latest --platform=linux/amd64 .
-          docker push ${{ env.DOCKER_IMAGE_URL }}pp-fe:latest
+          sed -i -e 's/EXPOSE 80/EXPOSE 8080/' -e 's/"--port", "80"/"--port", "8080"/' ./Dockerfile
+
+      - name: (QS) Build and Push Docker Image
+        working-directory: ./qns-svc
+        run: |
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-qns-svc:latest --platform=linux/amd64 .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-qns-svc:latest
 
       # - name: Deploy to Cloud Run
-        
+
       #   run: |
       #     echo SERVICE_NAME $SERVICE_NAME
       #     gcloud run deploy $SERVICE_NAME \
       #       --image ${{ env.DOCKER_IMAGE_URL }}:latest \
       #       --platform managed \
       #       --region asia-southeast1 \
       #       --allow-unauthenticated
-            
+
       # If required, use the Cloud Run URL output in later steps
       - name: 'Show output'
         run: |2-

PeerPrep/.env.template

@@ -0,0 +1,5 @@
+# VITE_API_URL=https://api.peerprep.cloud
+VITE_API_URL=http://localhost:8000
+VITE_SIGNALING_SERVER_URL=ws://localhost:4444
+VITE_ICE_SERVERS=stun:stun.l.google.com:19302
+VITE_WS_GATEWAY_URL=ws://localhost:8000/ws/fe

PeerPrep/.gitignore

@@ -13,6 +13,7 @@ dist-ssr
 *.local
 
 # Editor directories and files
+.env
 .vscode/*
 !.vscode/extensions.json
 .idea

PeerPrep/.prettierrc

@@ -2,5 +2,6 @@
   "trailingComma": "es5",
   "tabWidth": 2,
   "singleQuote": true,
-  "printWidth": 80
+  "printWidth": 80,
+  "endOfLine": "auto"
 }