Merge pull request #126 from CS3219-AY2526Sem1/sheenkerr-patch-2

Use environment variable for Docker image URL

Author: sheenkerr

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

@@ -29,6 +29,9 @@
 
 name: 'Build and Deploy to Cloud Run'
 
+env:
+  DOCKER_IMAGE_URL: asia-southeast1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/peerprep/
+
 on:
   workflow_dispatch:
 
@@ -64,26 +67,26 @@ jobs:
       - name: (AG) Build and Push Docker Image
         working-directory: ./api-gateway
         run: |
-          docker build -t pp-api-gateway:latest .
-          docker push asia-southeast1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/pp-api-gateway:latest
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-api-gateway:latest .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-api-gateway:latest
 
       - name: (CS) Build and Push Docker Image
         working-directory: ./collaborationt-svc
         run: |
-          docker build -t pp-collaborationt-svc:latest .
-          docker push asia-southeast1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/pp-collaboration-svc:latest     
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-collaborationt-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 pp-expire-observer-svc:latest .
-          docker push asia-southeast1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/pp-expire-observer-svc:latest 
+          docker build -t ${{ 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
         run: |
-          docker build -t pp-matching-svc:latest .
-          docker push asia-southeast1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/pp-matching-svc:latest
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-matching-svc:latest .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-matching-svc:latest
 
       - name: (QHS) Build and Push Docker Image
         working-directory: ./qns-hist-svc
@@ -94,20 +97,20 @@ jobs:
       - name: (QS) Build and Push Docker Image
         working-directory: ./qns-svc
         run: |
-          docker build -t pp-qns-svc:latest .
-          docker push asia-southeast1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/pp-qns-svc:latest
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-qns-svc:latest .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-qns-svc:latest
 
       - name: (US) Build and Push Docker Image
         working-directory: ./user-svc
         run: |
-          docker build -t pp-user-svc:latest .
-          docker push asia-southeast1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/pp-user-svc:latest
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-user-svc:latest .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-user-svc:latest
 
       - name: (FE) Build and Push Docker Image
         working-directory: ./PeerPrep
         run: |
-          docker build -t pp-fe:latest .
-          docker push asia-southeast1-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/pp-fe:latest
+          docker build -t ${{ env.DOCKER_IMAGE_URL }}pp-fe:latest .
+          docker push ${{ env.DOCKER_IMAGE_URL }}pp-fe:latest
 
       # - name: Deploy to Cloud Run