Skip to content

Commit

Permalink
ref: dual-write docker image to artifact registry
Browse files Browse the repository at this point in the history
as part of OPS-3966 we're migrating off of deprecated gcr
  • Loading branch information
asottile-sentry committed Apr 18, 2024
1 parent 8ede52a commit 82f3bfa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ jobs:
- name: Pull the test image
id: image_pull
env:
IMAGE_URL: us.gcr.io/sentryio/snuba:${{ github.sha }}
IMAGE_URL: us-central1-docker.pkg.dev/sentryio/snuba/image:${{ github.sha }}
shell: bash
run: |
echo "We poll for the Docker image that the GCB/GHA build produces until it succeeds or this job times out."
Expand All @@ -455,7 +455,7 @@ jobs:
shell: bash
env:
SHORT_SHA: ${{ steps.short_sha.outputs.sha }}
IMAGE_URL: us.gcr.io/sentryio/snuba:${{ github.sha }}
IMAGE_URL: us-central1-docker.pkg.dev/sentryio/snuba/image:${{ github.sha }}
run: |
# only login if the password is set
if [[ "${{ secrets.DOCKER_HUB_RW_TOKEN }}" ]]; then echo "${{ secrets.DOCKER_HUB_RW_TOKEN }}" | docker login --username=sentrybuilder --password-stdin; fi
Expand Down
6 changes: 5 additions & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ steps:
"--build-arg",
"SOURCE_COMMIT=$COMMIT_SHA",
"--destination=us.gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA",
"--destination=us-central1-docker.pkg.dev/$PROJECT_ID/snuba/image:$COMMIT_SHA",
"--target=application",
"-f",
"./Dockerfile",
Expand All @@ -23,7 +24,10 @@ steps:


# This is needed for Freight to find matching builds
images: ['us.gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA']
images: [
'us.gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA',
'us-central1-docker.pkg.dev/$PROJECT_ID/snuba/image:$COMMIT_SHA',
]
timeout: 2640s
options:
# We need more memory for Webpack builds & e2e self-hosted tests
Expand Down

0 comments on commit 82f3bfa

Please sign in to comment.