Update google-cloudrun-docker.yml

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

@@ -1,32 +1,3 @@
-# This workflow build and push a Docker container to Google Artifact Registry
-# and deploy it on Cloud Run when a commit is pushed to the "main"
-# branch.
-#
-# To configure this workflow:
-#
-# 1. Enable the following Google Cloud APIs:
-#
-#    - Artifact Registry (artifactregistry.googleapis.com)
-#    - Cloud Run (run.googleapis.com)
-#    - IAM Credentials API (iamcredentials.googleapis.com)
-#
-#    You can learn more about enabling APIs at
-#    https://support.google.com/googleapi/answer/6158841.
-#
-# 2. Create and configure a Workload Identity Provider for GitHub:
-#    https://github.com/google-github-actions/auth#preferred-direct-workload-identity-federation.
-#
-#    Depending on how you authenticate, you will need to grant an IAM principal
-#    permissions on Google Cloud:
-#
-#    - Artifact Registry Administrator (roles/artifactregistry.admin)
-#    - Cloud Run Developer (roles/run.developer)
-#
-#    You can learn more about setting IAM permissions at
-#    https://cloud.google.com/iam/docs/manage-access-other-resources
-#
-# 3. Change the values in the "env" block to match your values.
-
 name: 'Build and Deploy to Cloud Run'
 
 on:
@@ -35,10 +6,9 @@ on:
       - main
 
 env:
-  PROJECT_ID: 'legalqaapp' # TODO: update to your Google Cloud project ID
-  REGION: 'us-central1' # TODO: update to your region
-  SERVICE: 'legalappgh' # TODO: update to your service name
-  #WORKLOAD_IDENTITY_PROVIDER: 'projects/123456789/locations/global/workloadIdentityPools/my-pool/providers/my-provider' # TODO: update to your workload identity provider
+  PROJECT_ID: 'legalqaapp' # Update this to your GCP project ID
+  REGION: 'us-west1' # Update to your preferred GCP region
+  SERVICE: 'legalqagithub' # Update to your Cloud Run service name
 
 jobs:
   deploy:
@@ -50,46 +20,38 @@ jobs:
 
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v4' # actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+        uses: 'actions/checkout@v3'
 
-      # Authentication
-      #
-      # See https://github.com/google-github-actions/auth for more options,
-      # including authenticating via a JSON credentials file.
+      # Authenticate to Google Cloud using Workload Identity Federation or JSON key
       - id: 'auth'
         name: 'Authenticate to Google Cloud'
         uses: 'google-github-actions/auth@v2'
         with:
-          credentials_json: '${{ secrets.GCP_CREDENTIALS }}'
+          credentials_json: '${{ secrets.GCP_CREDENTIALS }}' # Reference your saved GCP credentials secret
 
-      # BEGIN - Docker auth and build
-      #
-      # If you already have a container image, you can omit these steps.
+      # Docker authentication and build
       - name: 'Docker Auth'
-        uses: 'docker/login-action@v3' # docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+        uses: 'docker/login-action@v3'
         with:
           username: 'oauth2accesstoken'
-          password: '${{ steps.auth.outputs.auth_token }}'
-          registry: '${{ env.REGION }}-docker.pkg.dev'
+          password: '${{ steps.auth.outputs.token }}'  # Use the correct token from the auth step
+          registry: '${{ env.REGION }}-docker.pkg.dev' # Google Artifact Registry URL
 
       - name: 'Build and Push Container'
         run: |-
-          DOCKER_TAG="$${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}:${{ github.sha }}"
+          DOCKER_TAG="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/legalapp/${{ env.SERVICE }}:${{ github.sha }}"
           docker build --tag "${DOCKER_TAG}" .
           docker push "${DOCKER_TAG}"
-      - name: 'Deploy to Cloud Run'
-
-        # END - Docker auth and build
 
-        uses: 'google-github-actions/deploy-cloudrun@v2' # google-github-actions/deploy-cloudrun@33553064113a37d688aa6937bacbdc481580be17
+      # Deploy to Google Cloud Run
+      - name: 'Deploy to Cloud Run'
+        uses: 'google-github-actions/deploy-cloudrun@v2'
         with:
           service: '${{ env.SERVICE }}'
           region: '${{ env.REGION }}'
-          # NOTE: If using a pre-built image, update the image name below:
+          image: '${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/legalapp/${{ env.SERVICE }}:${{ github.sha }}'
 
-          image: '${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}:${{ github.sha }}'
-      # If required, use the Cloud Run URL output in later steps
+      # Display the Cloud Run service URL
       - name: 'Show output'
-        run: |2-
-
+        run: |
           echo ${{ steps.deploy.outputs.url }}