Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Roger13579 committed Apr 24, 2024
2 parents db91242 + a82a862 commit 2515b3e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/google-cloudrun-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ on:

env:
PROJECT_ID: sincere-strata-420613 # TODO: update Google Cloud project id
GAR_LOCATION: asia-east1-docker.pkg.dev/sincere-strata-420613/cloud-run-source-deploy # TODO: update Artifact Registry location
GAR_LOCATION: asia-east1 # TODO: update Artifact Registry location
SERVICE: ticketsystembackend # TODO: update Cloud Run service name
REPOSITORY: cloud-run-source-deploy
REGION: asia-east1 # TODO: update Cloud Run service region
MONGO_DB_URL: ${{ secrets.MONGO_DB_URL }}
jobs:
deploy:
# Add 'id-token' with the intended permissions for workload identity federation
Expand Down Expand Up @@ -94,8 +94,8 @@ jobs:

- name: Build and Push Container
run: |-
docker build -t "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}:${{ github.sha }}" ./
docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}:${{ github.sha }}"
docker build -t "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.REPOSITORY }}/${{ env.SERVICE }}:${{ github.sha }}" ./
docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.REPOSITORY }}/${{ env.SERVICE }}:${{ github.sha }}"
# END - Docker auth and build

Expand All @@ -106,7 +106,7 @@ jobs:
service: ${{ env.SERVICE }}
region: ${{ env.REGION }}
# NOTE: If using a pre-built image, update the image name here
image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.SERVICE }}/${{ env.SERVICE }}:${{ github.sha }}
image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.REPOSITORY }}/${{ env.SERVICE }}:${{ github.sha }}

# If required, use the Cloud Run url output in later steps
- name: Show Output
Expand Down

0 comments on commit 2515b3e

Please sign in to comment.