From cbbf048db53bb12efd9f5637de14095064a843f3 Mon Sep 17 00:00:00 2001 From: Tony Le Date: Mon, 10 Nov 2025 14:53:19 -0500 Subject: [PATCH 1/2] chore: Push images to both SR and MR registries --- cloudbuild.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index bb0ff8ae..b2254e6e 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -4,6 +4,8 @@ steps: 'build', '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/topicctl/image:$COMMIT_SHA', '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/topicctl/image:latest', + '-t', 'us-docker.pkg.dev/sentryio/topicctl-mr/image:$COMMIT_SHA', + '-t', 'us-docker.pkg.dev/sentryio/topicctl-mr/image:latest', '--build-arg', 'VERSION=$COMMIT_SHA', '--build-arg', @@ -21,8 +23,10 @@ steps: # Only push "latest" tag when building on "main" [ "$BRANCH_NAME" != "main" ] && exit 0 docker push us-central1-docker.pkg.dev/$PROJECT_ID/topicctl/image:latest + docker push us-docker.pkg.dev/sentryio/topicctl-mr/image:latest images: [ 'us-central1-docker.pkg.dev/$PROJECT_ID/topicctl/image:$COMMIT_SHA', + 'us-docker.pkg.dev/sentryio/topicctl-mr/image:$COMMIT_SHA', ] timeout: 180s From 8d0f35423941f236932261a3f870afe1571e2c02 Mon Sep 17 00:00:00 2001 From: Tony Le Date: Mon, 10 Nov 2025 15:04:38 -0500 Subject: [PATCH 2/2] Use PROJECT_ID --- cloudbuild.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index b2254e6e..ecbf8729 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -4,8 +4,8 @@ steps: 'build', '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/topicctl/image:$COMMIT_SHA', '-t', 'us-central1-docker.pkg.dev/$PROJECT_ID/topicctl/image:latest', - '-t', 'us-docker.pkg.dev/sentryio/topicctl-mr/image:$COMMIT_SHA', - '-t', 'us-docker.pkg.dev/sentryio/topicctl-mr/image:latest', + '-t', 'us-docker.pkg.dev/$PROJECT_ID/topicctl-mr/image:$COMMIT_SHA', + '-t', 'us-docker.pkg.dev/$PROJECT_ID/topicctl-mr/image:latest', '--build-arg', 'VERSION=$COMMIT_SHA', '--build-arg', @@ -23,10 +23,10 @@ steps: # Only push "latest" tag when building on "main" [ "$BRANCH_NAME" != "main" ] && exit 0 docker push us-central1-docker.pkg.dev/$PROJECT_ID/topicctl/image:latest - docker push us-docker.pkg.dev/sentryio/topicctl-mr/image:latest + docker push us-docker.pkg.dev/$PROJECT_ID/topicctl-mr/image:latest images: [ 'us-central1-docker.pkg.dev/$PROJECT_ID/topicctl/image:$COMMIT_SHA', - 'us-docker.pkg.dev/sentryio/topicctl-mr/image:$COMMIT_SHA', + 'us-docker.pkg.dev/$PROJECT_ID/topicctl-mr/image:$COMMIT_SHA', ] timeout: 180s