Create release 0.1.7 (#115)

Fix Docker configuration in prod workflow Co-authored-by: Ong Jun Xiong <[email protected]> Co-authored-by: Charisma Kausar <[email protected]> Co-authored-by: Charisma Kausar <[email protected]> Co-authored-by: Gabriel Goh <[email protected]>
CS3219-AY2324S1 · Oct 17, 2023 · 6206b3f · 6206b3f
1 parent bc9bab4
commit 6206b3f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -32,7 +32,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Authenticate to Google Cloud
+      - id: 'auth'
+        name: Authenticate to Google Cloud
         uses: 'google-github-actions/auth@v1'
         with:
           workload_identity_provider: projects/345207492413/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-oidc
@@ -42,11 +43,10 @@ jobs:
       - name: Setup Google Cloud SDK
         uses: google-github-actions/setup-gcloud@v1
 
-      # Configure Docker to use the gcloud command-line tool as a credential
-      # helper for authentication
-      - name: Configure Docker to use gcloud
+      # Configure Docker to login to google cloud
+      - name: Configure Docker
         run: |-
-          gcloud --quiet auth configure-docker
+          echo ${{steps.auth.outputs.access_token}} | docker login -u oauth2accesstoken --password-stdin https://$GKE_REGION-docker.pkg.dev
 
       # Get the GKE credentials so that we can deploy to the cluster
       - name: Get Google Kubernetes Engine credentials for production

diff --git a/deployment/build-prod-images.sh b/deployment/build-prod-images.sh
@@ -7,7 +7,7 @@ service_array=("admin-service" "collaboration-service" "gateway" "matching-servi
 # Build and publish prod images with context set to be parent directory
 for s in ${service_array[@]}; do
   docker build \
-    --tag asia-southeast1-docker.pkg.dev/$PROJECT_ID/$ARTIFACT_REPOSITORY_NAME/${service_array[s]}:latest \
+    --tag $GKE_REGION-docker.pkg.dev/$PROJECT_ID/$ARTIFACT_REPOSITORY_NAME/${service_array[s]}:latest \
     --file prod-dockerfiles/Dockerfile.${service_array[s]}-prod ..
-  docker push asia-southeast1-docker.pkg.dev/$PROJECT_ID/$ARTIFACT_REPOSITORY_NAME/${service_array[s]}:latest
+  docker push $GKE_REGION-docker.pkg.dev/$PROJECT_ID/$ARTIFACT_REPOSITORY_NAME/${service_array[s]}:latest
 done