From bb73586f1b8606496af65d493b7b1b3b5bd54cba Mon Sep 17 00:00:00 2001 From: Alexander Tarasov Date: Mon, 19 Oct 2026 11:51:56 +0200 Subject: [PATCH 1/2] ref(deploy): Use the plain vroom image tags Since #734 the plain tags and the -distroless tags point to the same distroless image, so deploys and devservices can go back to the plain tags. The -distroless tags can stop being published after this. Co-Authored-By: Claude --- devservices/config.yml | 2 +- gocd/templates/bash/deploy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devservices/config.yml b/devservices/config.yml index ebdde29b..8c6b5893 100644 --- a/devservices/config.yml +++ b/devservices/config.yml @@ -14,7 +14,7 @@ x-sentry-service-config: default: [kafka, vroom] services: vroom: - image: ghcr.io/getsentry/vroom:nightly-distroless + image: ghcr.io/getsentry/vroom:nightly ports: - 127.0.0.1:8085:8085 environment: diff --git a/gocd/templates/bash/deploy.sh b/gocd/templates/bash/deploy.sh index 94bfa5d3..2bba608f 100644 --- a/gocd/templates/bash/deploy.sh +++ b/gocd/templates/bash/deploy.sh @@ -5,5 +5,5 @@ eval $(regions-project-env-vars --region="${SENTRY_REGION}") /devinfra/scripts/get-cluster-credentials k8s-deploy \ --label-selector="${LABEL_SELECTOR}" \ - --image="us-central1-docker.pkg.dev/sentryio/vroom/vroom:${GO_REVISION_VROOM_REPO}-distroless" \ + --image="us-central1-docker.pkg.dev/sentryio/vroom/vroom:${GO_REVISION_VROOM_REPO}" \ --container-name="vroom" From d52e55ec8789e13a639cb90f1b92f427a6fec9fd Mon Sep 17 00:00:00 2001 From: Alexander Tarasov Date: Mon, 19 Oct 2026 11:53:01 +0200 Subject: [PATCH 2/2] ci(image): Stop publishing the -distroless image tags Nothing pulls them anymore: deploys and devservices use the plain tags. Co-Authored-By: Claude --- .github/workflows/image.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 0de9a5a1..6577739d 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -89,9 +89,7 @@ jobs: docker tag vroom:arm64 ghcr.io/getsentry/vroom:${{ github.sha }}-arm64 docker push ghcr.io/getsentry/vroom:${{ github.sha }}-arm64 - # The image is distroless. The "-distroless" tags are kept until - # everything that pulls them (deploys, devservices) moves to the plain tags. - for tag in ${{ github.sha }} ${{ github.sha }}-distroless nightly nightly-distroless; do + for tag in ${{ github.sha }} nightly; do docker manifest create \ ghcr.io/getsentry/vroom:${tag} \ --amend ghcr.io/getsentry/vroom:${{ github.sha }}-amd64 \ @@ -162,7 +160,6 @@ jobs: tag_nightly: false tag_latest: true google_ar_image_name: us-central1-docker.pkg.dev/sentryio/vroom/vroom - tags: us-central1-docker.pkg.dev/sentryio/vroom/vroom:${{ github.sha }}-distroless google_workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool google_service_account: gha-vroom-push@sac-prod-sa.iam.gserviceaccount.com # The builder stage starts with `COPY . .`, so nothing from a previous @@ -182,7 +179,6 @@ jobs: tag_nightly: false tag_latest: true google_ar_image_name: us-docker.pkg.dev/sentryio/vroom-mr/vroom - tags: us-docker.pkg.dev/sentryio/vroom-mr/vroom:${{ github.sha }}-distroless google_workload_identity_provider: projects/868781662168/locations/global/workloadIdentityPools/prod-github/providers/github-oidc-pool google_service_account: gha-vroom-push@sac-prod-sa.iam.gserviceaccount.com cache_from: type=local,src=${{ runner.temp }}/vroom-buildcache