Skip to content

[Backport 6.6.x] update registries and fix docker login #1265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 7, 2025
Merged

[Backport 6.6.x] update registries and fix docker login #1265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7512735
[Backport 6.6.x] fix: update internal registry from legacy to new rev…
sourcegraph-release-bot Aug 7, 2025
f19d2ef
chore(ci): fetch docker username and password and update docker regis…
burmudar Aug 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .buildkite/vagrant-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ if [ ! -f ${KEY_PATH} ]; then
gcloud secrets versions access latest --secret=e2e-builder-sa-key --quiet --project=sourcegraph-ci > "${KEY_PATH}"
fi
export GOOGLE_JSON_KEY_LOCATION="${KEY_PATH}"
export DOCKER_USERNAME=sourcegraph
export DOCKER_PASSWORD="$(gcloud secrets versions access latest --secret=DOCKER_PASSWORD_BUILDKITE_AGENT --quiet --project=sourcegraph-ci)"

echo --- ":vagrant: starting box $box"
vagrant up "$box" --provider=google || exit_code=$?
Expand Down
12 changes: 6 additions & 6 deletions batch-change/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,34 @@ internal:
- name: docker(compose):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../docker-compose/
- name: docker(shell):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind pure-docker --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../pure-docker/
minor:
- name: docker(compose):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../docker-compose/
- name: docker(shell):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind pure-docker --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../pure-docker/
major:
- name: docker(compose):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../docker-compose/
- name: docker(shell):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind pure-docker --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../pure-docker/
finalize:
steps:
Expand Down
12 changes: 6 additions & 6 deletions release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ internal:
- name: docker(compose):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/
- name: docker(shell):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/
- name: "git:branch"
cmd: |
Expand All @@ -57,12 +57,12 @@ internal:
- name: docker(compose):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/
- name: docker(shell):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/
- name: "git:branch"
cmd: |
Expand All @@ -83,12 +83,12 @@ internal:
- name: docker(compose):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/
- name: docker(shell):tags
cmd: |
set -eu
registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal
registry=us-docker.pkg.dev/sourcegraph-images/internal
sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/
- name: "git:branch"
cmd: |
Expand Down
4 changes: 3 additions & 1 deletion test/smoke-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
set -euxfo pipefail

configure_docker() {
set +x
if [ -n "${DOCKER_USERNAME}" ] && [ -n "${DOCKER_PASSWORD}" ]; then
docker login -u "${DOCKER_USERNAME}" --password-stdin <<<"$DOCKER_PASSWORD"
fi
set -x
gcloud auth configure-docker
gcloud auth configure-docker us-central1-docker.pkg.dev
gcloud auth configure-docker us-central1-docker.pkg.dev,us-docker.pkg.dev
}

deploy_sourcegraph() {
Expand Down
Loading