From 4b1e5e3cf4b87c3ed29684ffb93835e997f2a56c Mon Sep 17 00:00:00 2001 From: Michael Lin Date: Wed, 21 Oct 2026 11:35:09 -0700 Subject: [PATCH 1/4] [Backport 8.1.x] release: Hand "Update main" PRs over to the releaseworker (#1444) Backports #1443 so 8.1.x patch releases use the same releaseworker-owned "Update main" flow as main. This is an unchanged cherry-pick: remove the old finalize PR creation and exclude update-main branches from promote steps. Requires sourcegraph/sourcegraph#17347 to be deployed before the next release. Companion backports are deploy-sourcegraph-helm#974 and the deploy-sourcegraph-k8s backport of #492. Co-authored-by: Warren Gifford --- .buildkite/pipeline.yaml | 4 ++-- release.yaml | 36 ------------------------------------ 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 852b496b9..2dbb8cc15 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -41,7 +41,7 @@ steps: sg release run test --workdir=. --config-from-commit - label: "(promote) Release: test" - if: build.branch =~ /^promote\/release-.*/ + if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/ plugins: - ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~ command: | @@ -58,7 +58,7 @@ steps: - label: "(promote) Release: finalize" - if: build.branch =~ /^promote\/release-.*/ + if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/ plugins: - ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~ command: | diff --git a/release.yaml b/release.yaml index b043fe076..544879460 100644 --- a/release.yaml +++ b/release.yaml @@ -224,39 +224,3 @@ promoteToPublic: cat << EOF | buildkite-agent annotate --style info Promoted release is **publicly available** through a git tag at [\`{{version}}\`](https://github.com/sourcegraph/deploy-sourcegraph-docker/tree/{{version}}). EOF - - - name: "update main with latest version" - - name: "git" - cmd: | - set -eu - branch="promote/release-{{version}}-update-main" - echo "Checking out origin/main" - git fetch origin main - git switch main - echo "Creating branch origin/${branch}" - git switch -c "${branch}" - - - name: docker(compose):tags - cmd: | - set -eu - registry=index.docker.io/sourcegraph - sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/ - - - name: "git:branch" - cmd: | - set -eu - branch="promote/release-{{version}}-update-main" - git commit -am 'prep update main: {{version}}' -m 'update main with latest release' - git push origin "${branch}" - - - name: "github:pr" - cmd: | - set -eu - # Create PR to merge release updates into main branch - gh pr create \ - --fill \ - --draft \ - --base main \ - --title "Update main: build {{version}}" \ - --body "Test plan: automated release PR, CI will perform additional checks" - echo "🚢 Please check the associated CI build to ensure the process completed". From 00b6c33c318386d46dba50fe9cd38b3c3b1db18a Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Mon, 26 Oct 2026 03:06:39 -0700 Subject: [PATCH 2/4] [Backport 8.1.x] release: Run promote finalize once, and make tag creation retry-safe (#1450) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Backport 794385b8bbe6918ecd52155362407f879f8e83a0 from #1449 In v8.1.1335, the k8s and Helm repos both failed their promotion the same way: creating the promote branch builds its first commit, the internal config commit "release: vX". `--config-from-commit` accepts that config, so the build runs the promote test and finalize jobs too. Its finalize tags the promote branch head, and the build the release worker monitors, for the "promote-release: vX" commit, then fails finalize with `fatal: tag 'vX' already exists`. The promote workflow fails and skips closing the release PRs and opening "Update main". See sourcegraph/deploy-sourcegraph-k8s builds #1197/#1201 and sourcegraph/deploy-sourcegraph-helm builds #3093/#3095. This repo has the same pipeline conditions and `git:tag` step. It got through v8.1.1335 only because the build of the internal config commit ([#16700](https://buildkite.com/sourcegraph/deploy-sourcegraph-docker/builds/16700)) was cancelled 10 seconds after it started, when newer commits arrived. That depends on a pipeline setting, not on anything in this repo. This is the same change as sourcegraph/deploy-sourcegraph-helm#979 and sourcegraph/deploy-sourcegraph-k8s#497: - **Promote jobs run only for the promote config commit.** `(promote) Release: test` and `finalize` now also require `build.message =~ /^promote-release:/`. Both the release worker and this repo's `release.yaml` manual flow write that message. - **`git:tag` is retry-safe.** If `vX` already points at the promote branch head, it skips creating the tag and continues. If it points anywhere else, it fails. The release registry's promote endpoint already treats re-promoting as a no-op (200), so a retried finalize now succeeds end to end. ## How this was tested - **Job conditions.** I checked the old and new conditions against this repo's real v8.1.1335 promote-branch commits. Before, every commit ran the promote jobs. After, only `63f7963` "promote-release: v8.1.1335" runs them; `8f0974d` "release: v8.1.1335" and `6845a34` (image update) skip them. This PR's Buildkite build validates that the pipeline, with its new conditionals, uploads. - **`git:tag`.** I extracted the step from this repo's `release.yaml`, stubbed `gh` and `buildkite-agent`, and ran it in fresh clones against a scratch bare remote: - **First finalize:** exits 0; the tag and `release-vX` are on the promote head. - **Retry or duplicate:** exits 0 with "already points at … not recreating it". - **Tag on another commit:** exits 1 with a message naming both commits. - **Control:** `main`'s step on the retry case exits 128 with `fatal: tag 'v9.9.9' already exists`. ## Rollout Buildkite reads `pipeline.yaml` and `release.yaml` from the commit it builds, so patch releases need this on their `X.Y.x` branch. It's labelled `backport 8.1.x`; both files are identical on `8.1.x`, so the backport applies cleanly. --- .buildkite/pipeline.yaml | 7 +++++-- release.yaml | 11 ++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 2dbb8cc15..8d2ca3568 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -40,8 +40,11 @@ steps: command: | sg release run test --workdir=. --config-from-commit + # Promote jobs run only for the promote config commit. Creating the promote + # branch also builds its first commit, the internal config commit, which + # --config-from-commit would otherwise accept, running finalize twice. - label: "(promote) Release: test" - if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/ + if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/ && build.message =~ /^promote-release:/ plugins: - ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~ command: | @@ -58,7 +61,7 @@ steps: - label: "(promote) Release: finalize" - if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/ + if: build.branch =~ /^promote\/release-.*/ && build.branch !~ /-update-main$/ && build.message =~ /^promote-release:/ plugins: - ssh://git@github.com/sourcegraph/sg-buildkite-plugin.git#main: ~ command: | diff --git a/release.yaml b/release.yaml index 544879460..83206ff7d 100644 --- a/release.yaml +++ b/release.yaml @@ -201,7 +201,16 @@ promoteToPublic: git checkout "${promote_branch}" git switch -c "${release_branch}" - git tag {{version}} + # A retried finalize finds its own tag; only a tag elsewhere is an error + if tagged=$(git rev-parse -q --verify "refs/tags/{{version}}^{commit}"); then + if [ "${tagged}" != "$(git rev-parse HEAD)" ]; then + echo "Tag {{version}} already exists at ${tagged}, not at ${promote_branch} ($(git rev-parse HEAD))" >&2 + exit 1 + fi + echo "Tag {{version}} already points at ${promote_branch}, not recreating it" + else + git tag {{version}} + fi git push origin ${release_branch} --tags # Web URL to the tag From 30e26cb46ec3f59735c282285252cc0f8b9858f6 Mon Sep 17 00:00:00 2001 From: sourcegraph-bot-2 <87207425+sourcegraph-bot-2@users.noreply.github.com> Date: Mon, 9 Nov 2026 23:11:36 +0000 Subject: [PATCH 3/4] Update compose images to v8.1.4690 --- .../db-only-migrate.docker-compose.yaml | 4 +- docker-compose/docker-compose.yaml | 52 +++++++++---------- .../executors/executor.docker-compose.yaml | 2 +- docker-compose/jaeger/docker-compose.yaml | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml index d8277e7b2..61e7c21dd 100644 --- a/docker-compose/db-only-migrate.docker-compose.yaml +++ b/docker-compose/db-only-migrate.docker-compose.yaml @@ -13,7 +13,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgresql-16:6.0.0@sha256:224a2604331cb73809f466394c5b4f3ca95bf6a5a140cb75820dfe67301074bb' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:8.1.4690@sha256:1bd9b7314bdb83d12162c20e1c8da580ca27c43a4f391404a30339faeefa033b' cpus: 4 mem_limit: '2g' healthcheck: @@ -30,7 +30,7 @@ services: codeintel-db: container_name: codeintel-db - image: 'index.docker.io/sourcegraph/postgresql-16:6.0.0@sha256:224a2604331cb73809f466394c5b4f3ca95bf6a5a140cb75820dfe67301074bb' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:8.1.4690@sha256:1bd9b7314bdb83d12162c20e1c8da580ca27c43a4f391404a30339faeefa033b' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 5201c97a0..681098b14 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -13,7 +13,7 @@ services: # for this container will need to be updated to reflect the new connection information. migrator: container_name: migrator - image: 'index.docker.io/sourcegraph/migrator:6.1.2889@sha256:67b5b187f006bb789898cd1ab02fd82f860fe1511524a416ba63ee71ebd603c6' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/migrator:8.1.4690@sha256:96b1c77bc5036b92a969db6a6e05573803e3dc9ba818f637b8af93009b7b1931' cpus: 0.5 mem_limit: '500m' command: ['up'] @@ -69,7 +69,7 @@ services: # https://caddyserver.com/docs/caddyfile caddy: container_name: caddy - image: 'index.docker.io/sourcegraph/caddy:6.1.2889@sha256:26443b2905169ec27efba3c090d9c04e0c0779d7fb4001cbdcbe32ec1598eb59' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/caddy:8.1.4690@sha256:99c7589fec5e7400c654dbf11584bc68b5eb6c206cf62499d03315b6fbd13401' cpus: 4 mem_limit: '4g' environment: @@ -124,7 +124,7 @@ services: # service. sourcegraph-frontend-0: container_name: sourcegraph-frontend-0 - image: 'index.docker.io/sourcegraph/frontend:6.1.2889@sha256:43dad562a65d08842659abdd06cf3c92d3745cc9e18c3762e458b78028a86e1e' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/frontend:8.1.4690@sha256:f9136bd6f6989e56fe285f8e146d1197bfa2f5e0129af75905edaf19e41f325e' cpus: 4 mem_limit: '8g' env_file: sourcegraph-uploads.env @@ -178,7 +178,7 @@ services: # sourcegraph-frontend-internal: container_name: sourcegraph-frontend-internal - image: 'index.docker.io/sourcegraph/frontend:6.1.2889@sha256:43dad562a65d08842659abdd06cf3c92d3745cc9e18c3762e458b78028a86e1e' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/frontend:8.1.4690@sha256:f9136bd6f6989e56fe285f8e146d1197bfa2f5e0129af75905edaf19e41f325e' cpus: 4 mem_limit: '8g' env_file: sourcegraph-uploads.env @@ -225,7 +225,7 @@ services: # gitserver-0: container_name: gitserver-0 - image: 'index.docker.io/sourcegraph/gitserver:6.1.2889@sha256:282142b7886f58b0ea7251575c92d5c837ff8649d5831c9c52745ebed6f3af4f' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/gitserver:8.1.4690@sha256:a8b97c0ad0ea6f4735774a084fa00a645d801a82f3fbe58401a32b5429ade96c' cpus: 4 mem_limit: '8g' env_file: sourcegraph-uploads.env @@ -249,7 +249,7 @@ services: # zoekt-indexserver-0: container_name: zoekt-indexserver-0 - image: 'index.docker.io/sourcegraph/search-indexer:6.1.2889@sha256:8a79ecf88f4f22ff72c8a50f33a2d43506c44deddf6ef2e43d8101af9ccd97c0' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/search-indexer:8.1.4690@sha256:1ecd80b08e78f3112e074cb493f64085e89aff7c3254199aec4aec970753df7b' cpus: 8 mem_limit: '16g' environment: @@ -272,7 +272,7 @@ services: # zoekt-webserver-0: container_name: zoekt-webserver-0 - image: 'index.docker.io/sourcegraph/indexed-searcher:6.1.2889@sha256:9bb181a003811fb0193c4fa594ded800f2f155752829f1c4f97a7bfa37dbe69e' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/indexed-searcher:8.1.4690@sha256:cee213e601c32ffc281f468c8f31c77d0ffa931395e97a19d0a2cb2eb9e2c065' cpus: 8 mem_limit: '50g' environment: @@ -299,7 +299,7 @@ services: # searcher-0: container_name: searcher-0 - image: 'index.docker.io/sourcegraph/searcher:6.1.2889@sha256:66f633e4e666d65684915087009bdbdb8a46dad6eccb4c307a6de141e0225be6' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/searcher:8.1.4690@sha256:527e41d7b7cc0c63afcdd31b4b0151111239ca904ca6bdf3786fc59ea7cb08db' cpus: 2 mem_limit: '2g' env_file: sourcegraph-uploads.env @@ -324,7 +324,7 @@ services: # precise-code-intel-worker: container_name: precise-code-intel-worker - image: 'index.docker.io/sourcegraph/precise-code-intel-worker:6.1.2889@sha256:2a8ec49e080ff19e6f05f92c39cfc67ac50b8e2ff5aba4dcbd7451bba1e8d539' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/precise-code-intel-worker:8.1.4690@sha256:5b1bdf0987970ed76514f2a568bb5f9aeb8fa61bf0db39c0219315bc3262c6df' cpus: 2 mem_limit: '4g' env_file: sourcegraph-uploads.env @@ -351,7 +351,7 @@ services: # worker: container_name: worker - image: 'index.docker.io/sourcegraph/worker:6.1.2889@sha256:1ef615670e315edda8511ab1e06ffd27b98129bc962bf06aca455c7731baf482' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/worker:8.1.4690@sha256:ebee488399d33216c30303a18c5199c2385e920e5f8dc756cfec3c8bbeeaa76d' cpus: 4 mem_limit: '4g' env_file: sourcegraph-uploads.env @@ -377,7 +377,7 @@ services: # syntactic-code-intel-worker: container_name: syntactic-code-intel-worker - image: 'index.docker.io/sourcegraph/syntactic-code-intel-worker:6.1.1295@sha256:c6e2b097b8f16394e339588e208c43587f1fa6a35cb44e9759622c448ddc1445' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/syntactic-code-intel-worker:8.1.4690@sha256:e8c11c42c727a8dc121588ea5a93befee1f6471598d65cfdbf965aa8c3c35c71' cpus: 2 mem_limit: '4g' env_file: sourcegraph-uploads.env @@ -404,7 +404,7 @@ services: # syntect-server: container_name: syntect-server - image: 'index.docker.io/sourcegraph/syntax-highlighter:6.1.2889@sha256:eea296267ca84c8d06eb9c1e44fd5f4c4fbb3f0490193517cc3764d558a773c6' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/syntax-highlighter:8.1.4690@sha256:fa844033613351aa768875c510da0155bcd9093add6ab25b4fcf9a770ca059e4' cpus: 4 mem_limit: '6g' healthcheck: @@ -425,7 +425,7 @@ services: # prometheus: container_name: prometheus - image: 'index.docker.io/sourcegraph/prometheus:6.1.2889@sha256:75fa45933ecb03f7aca1d54ec5ebc05d11ff300494a2ca8fbaefa25c83f0326f' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/prometheus:8.1.4690@sha256:2cda4133ec323587e119e2a242669bd610107a980ef672ad0e3de75481700d82' cpus: 4 mem_limit: '8g' volumes: @@ -452,7 +452,7 @@ services: # 'GF_SERVER_ROOT_URL='https://grafana.example.com' grafana: container_name: grafana - image: 'index.docker.io/sourcegraph/grafana:6.3.3@sha256:2f68b9b1542e7d75459d983b606d2fdd1c11a75610464e3d7a6ced4f3ac474bf' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/grafana:8.1.4690@sha256:38ebec5ea67f7d146480bfbccebdaf306c4af3b247f04a01f2f11e5eec886b53' cpus: 1 mem_limit: '1g' volumes: @@ -471,7 +471,7 @@ services: # cadvisor: container_name: cadvisor - image: 'index.docker.io/sourcegraph/cadvisor:6.1.2889@sha256:c13394cf2de03154dd48e78129bf3d4cc31854ab98dedafd3901b413d54b4822' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/cadvisor:8.1.4690@sha256:166d6aaba9ff44dd2e88952c7a35192e156c8608e66cbc820b2fbf59d0c5360b' cpus: 1 mem_limit: '1g' # You may set `privileged` to `false and `cadvisor` will run with reduced privileges. @@ -504,7 +504,7 @@ services: # node-exporter: container_name: node-exporter - image: 'index.docker.io/sourcegraph/node-exporter:6.1.2889@sha256:e496aa37a1053cd59f0025c232fd58261ae08d934269870a343061c7a9596bfd' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/node-exporter:8.1.4690@sha256:fa0c4b00363385eadca32fdf982550b2c0115dc202c3fd66206a3412306b6500' cpus: .5 mem_limit: '1g' pid: 'host' @@ -533,7 +533,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgresql-16:6.1.2889@sha256:8cb7b0f54c7ab464f8e3b26918a70bebcb060219dd0b91084209563238ec1dd5' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:8.1.4690@sha256:1bd9b7314bdb83d12162c20e1c8da580ca27c43a4f391404a30339faeefa033b' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -561,7 +561,7 @@ services: # for this container will need to be updated to reflect the new connection information. pgsql-exporter: container_name: pgsql-exporter - image: 'index.docker.io/sourcegraph/postgres_exporter:6.1.2889@sha256:a2fedb3d4aa845375d3c60f37e2813d095c6718c2afa96c2bcc8c17dc8b73991' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgres_exporter:8.1.4690@sha256:a1d2d6efb3e4ee74c01502edfc21fc23763ea1f5bb43bf8d161a5057db6e7104' cpus: 0.1 mem_limit: '50m' networks: @@ -580,7 +580,7 @@ services: # codeintel-db: container_name: codeintel-db - image: 'index.docker.io/sourcegraph/postgresql-16:6.1.2889@sha256:8cb7b0f54c7ab464f8e3b26918a70bebcb060219dd0b91084209563238ec1dd5' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16:8.1.4690@sha256:1bd9b7314bdb83d12162c20e1c8da580ca27c43a4f391404a30339faeefa033b' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -608,7 +608,7 @@ services: # for this container will need to be updated to reflect the new connection information. codeintel-db-exporter: container_name: codeintel-db-exporter - image: 'index.docker.io/sourcegraph/postgres_exporter:6.1.2889@sha256:a2fedb3d4aa845375d3c60f37e2813d095c6718c2afa96c2bcc8c17dc8b73991' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgres_exporter:8.1.4690@sha256:a1d2d6efb3e4ee74c01502edfc21fc23763ea1f5bb43bf8d161a5057db6e7104' cpus: 0.1 mem_limit: '50m' networks: @@ -627,7 +627,7 @@ services: # codeinsights-db: container_name: codeinsights-db - image: 'index.docker.io/sourcegraph/postgresql-16-codeinsights:6.1.2889@sha256:7d84febae82181e096f79e26f6459e86fa66a40ccbe30ff0f37cb118707e4e2a' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgresql-16-codeinsights:8.1.4690@sha256:2403f4ec8e89225fd6606af41e442588d944935b4b3bea6346cd9470ea3b0a0e' cpus: 4 mem_limit: '2g' shm_size: '1g' @@ -660,7 +660,7 @@ services: # for this container will need to be updated to reflect the new connection information. codeinsights-db-exporter: container_name: codeinsights-db-exporter - image: 'index.docker.io/sourcegraph/postgres_exporter:6.1.2889@sha256:a2fedb3d4aa845375d3c60f37e2813d095c6718c2afa96c2bcc8c17dc8b73991' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/postgres_exporter:8.1.4690@sha256:a1d2d6efb3e4ee74c01502edfc21fc23763ea1f5bb43bf8d161a5057db6e7104' cpus: 0.1 mem_limit: '50m' networks: @@ -679,7 +679,7 @@ services: # blobstore: container_name: blobstore - image: 'index.docker.io/sourcegraph/blobstore:6.1.2889@sha256:8f49a897d7f7ad4655df9cd79959620ddb73406adccccd567c4846aa24ec4a01' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/blobstore:8.1.4690@sha256:59fba8ef0a7dbc53a5d045af8336a7454ec1371ce452ee4ff046cb480dcc56ab' cpus: 1 mem_limit: '1g' healthcheck: @@ -702,7 +702,7 @@ services: # redis-cache: container_name: redis-cache - image: 'index.docker.io/sourcegraph/redis-cache:6.1.2889@sha256:204c164bc59119cde8b8d19a640897e8ffe008e040b730bed2188f28fca0d31c' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/redis-cache:8.1.4690@sha256:da52e54beb9090622fdb06a17d4d191277741b537c88067e50aebd3086d432f2' cpus: 1 mem_limit: '7g' volumes: @@ -718,7 +718,7 @@ services: # redis-store: container_name: redis-store - image: 'index.docker.io/sourcegraph/redis-store:6.1.2889@sha256:4f4dfb3074e586b7eb8ab2ba631285aeb5e018452219e2f1a2f235c85b8de4bc' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/redis-store:8.1.4690@sha256:edc02f4327a80a274a50bb6ddd855c73fdeee4529298b65be5b6faa9ae9c1e82' cpus: 1 mem_limit: '7g' volumes: @@ -733,7 +733,7 @@ services: # Ports exposed to the public internet: none otel-collector: container_name: otel-collector - image: 'index.docker.io/sourcegraph/opentelemetry-collector:6.1.2889@sha256:c05e84380dd81d74ff952f73d132710dc4a162fa26c0a0709fba58dcb2829958' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/opentelemetry-collector:8.1.4690@sha256:52bbc05485f010948a2e07eab2a367290a918b8a7b0002beaadb4699bd08523f' cpus: 1 mem_limit: '1g' networks: diff --git a/docker-compose/executors/executor.docker-compose.yaml b/docker-compose/executors/executor.docker-compose.yaml index 10b4296c8..7c752cab2 100644 --- a/docker-compose/executors/executor.docker-compose.yaml +++ b/docker-compose/executors/executor.docker-compose.yaml @@ -2,7 +2,7 @@ version: '2.4' services: executor: container_name: executor - image: 'index.docker.io/sourcegraph/executor:6.0.0@sha256:0be94a7c91f8273db10fdf46718c6596340ab2acc570e7b85353806e67a27508' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/executor:8.1.4690@sha256:47da0f470dfacda9785bee7cab4a3a1fbb361631c3fef87027a390f2d7c296d1' cpus: 1 mem_limit: '4g' # Run as root (required for docker daemon control) diff --git a/docker-compose/jaeger/docker-compose.yaml b/docker-compose/jaeger/docker-compose.yaml index c465d4ab8..4d399d0e0 100644 --- a/docker-compose/jaeger/docker-compose.yaml +++ b/docker-compose/jaeger/docker-compose.yaml @@ -10,7 +10,7 @@ services: # jaeger: container_name: jaeger - image: 'index.docker.io/sourcegraph/jaeger-all-in-one:6.1.2889@sha256:d35f0bf61a5be6fe73714bb06e489a68024a77ea7d0a9f346c42633d66c8b1d3' + image: 'us-docker.pkg.dev/sourcegraph-images/internal/jaeger-all-in-one:8.1.4690@sha256:a42e031d38e484642b8c7c6d5176694a98c530398d450b4c19f20e179fb1a331' cpus: 0.5 mem_limit: '512m' ports: From f7a0c2d446a6cc851e41c46e127892e9ec628c39 Mon Sep 17 00:00:00 2001 From: sourcegraph-bot-2 <87207425+sourcegraph-bot-2@users.noreply.github.com> Date: Mon, 9 Nov 2026 23:11:37 +0000 Subject: [PATCH 4/4] release: v8.1.4690 {"version":"v8.1.4690","inputs":"server=v8.1.4690","type":"patch"}