From 823157900d4602aff617144ec5bbfcad831a9682 Mon Sep 17 00:00:00 2001 From: Jacob Pleiness Date: Thu, 18 Sep 2025 20:40:02 +0000 Subject: [PATCH] release_patch: v6.8.0 {"version":"v6.8.0","inputs":"server=v6.8.0","type":"patch"} --- .../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..874703179 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:6.8.0@sha256:c60886d645c5811fcd816f3c5d86b3166bf536ea0aeea5313a3c6c439ce239f2' 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:6.8.0@sha256:c60886d645c5811fcd816f3c5d86b3166bf536ea0aeea5313a3c6c439ce239f2' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 60403932f..307d70e24 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:6.8.0@sha256:9632c3267c80b97991870f53a1559c2dcf17b1471de4a9c8a5d621af15cfca57' 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:6.8.0@sha256:d4f6128bcbf82a5512e76136fbd69e502938fe5b06dd7b30dda1b72044e8ed6b' 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:6.8.0@sha256:2b2d2a36ad70c478532bf7b70f9d880cdaf04020cc4109482319ba18de86854e' cpus: 4 mem_limit: '8g' environment: @@ -177,7 +177,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:6.8.0@sha256:2b2d2a36ad70c478532bf7b70f9d880cdaf04020cc4109482319ba18de86854e' cpus: 4 mem_limit: '8g' environment: @@ -223,7 +223,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:6.8.0@sha256:696be65b622323b56ff753f0625f9301b6b3f3728f4288bbb2ab8c57b555f56b' cpus: 4 mem_limit: '8g' environment: @@ -246,7 +246,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:6.8.0@sha256:b5b8a8e0a403491bc92c2e77a5d0b63f326f3e17612ccdef7907183be232f3e1' cpus: 8 mem_limit: '16g' environment: @@ -269,7 +269,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:6.8.0@sha256:e53f1aa1edbd8d9d274c1d2d1266dbc217307b75329c5d7abad6a8a1a92279ce' cpus: 8 mem_limit: '50g' environment: @@ -296,7 +296,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:6.8.0@sha256:bdf4952f5f55867335a3b1bf93e1719df826b8221cfc22ca6fec58e9cb2f6edc' cpus: 2 mem_limit: '2g' environment: @@ -320,7 +320,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:6.8.0@sha256:a36a0cc7c4c6767f6f4673b0a088e4950994002b71af6be0292b4b647602b5bc' cpus: 2 mem_limit: '4g' environment: @@ -346,7 +346,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:6.8.0@sha256:bd6cb3f56e814d73315fbc8c2385d6e10c7e176461266c130bd757bd852872f7' cpus: 4 mem_limit: '4g' environment: @@ -371,7 +371,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:6.8.0@sha256:fa6b37843baf950bb314478de8946df29d81b90ad71cfca19f1c8462c017cc95' cpus: 2 mem_limit: '4g' environment: @@ -398,7 +398,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:6.8.0@sha256:05bf48f902b6304bcf24c23b128be7220b370167b84258978514ccf5af74af35' cpus: 4 mem_limit: '6g' healthcheck: @@ -419,7 +419,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:6.8.0@sha256:8c5d91745874fe88515092ded9a0dfa5bef2262c63c59c5851dd42a3d41bdcf2' cpus: 4 mem_limit: '8g' volumes: @@ -446,7 +446,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:6.8.0@sha256:ef89555e084b50c54fcc08eb9c685a6721cb282f69709bd2d07c2f26aaf0e690' cpus: 1 mem_limit: '1g' volumes: @@ -465,7 +465,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:6.8.0@sha256:5b5b13d97f77d3bab66653c9f5d60265af906d43d4e84bd2816f8835275e9d95' cpus: 1 mem_limit: '1g' # You may set `privileged` to `false and `cadvisor` will run with reduced privileges. @@ -498,7 +498,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:6.8.0@sha256:52192276a9ba5ff02ae74841269934a9867424fa1ba6d305ce93ac1e12c0d3d5' cpus: .5 mem_limit: '1g' pid: 'host' @@ -527,7 +527,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:6.8.0@sha256:c60886d645c5811fcd816f3c5d86b3166bf536ea0aeea5313a3c6c439ce239f2' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -555,7 +555,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:6.8.0@sha256:de627b16bf5dbaf9e970a81786ee4d0c11f1b00235a5bdc98c3fd54803063b57' cpus: 0.1 mem_limit: '50m' networks: @@ -574,7 +574,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:6.8.0@sha256:c60886d645c5811fcd816f3c5d86b3166bf536ea0aeea5313a3c6c439ce239f2' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -602,7 +602,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:6.8.0@sha256:de627b16bf5dbaf9e970a81786ee4d0c11f1b00235a5bdc98c3fd54803063b57' cpus: 0.1 mem_limit: '50m' networks: @@ -621,7 +621,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:6.8.0@sha256:e1851576b02340ba269574e1423c029e659eabaa700048c28fcaf838eef9a63e' cpus: 4 mem_limit: '2g' shm_size: '1g' @@ -654,7 +654,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:6.8.0@sha256:de627b16bf5dbaf9e970a81786ee4d0c11f1b00235a5bdc98c3fd54803063b57' cpus: 0.1 mem_limit: '50m' networks: @@ -673,7 +673,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:6.8.0@sha256:40cb6ec6b3af040cb2c8a2739ab37772f1c72b93e0b19c48441918c525afe944' cpus: 1 mem_limit: '1g' healthcheck: @@ -696,7 +696,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:6.8.0@sha256:df6e701868cda083d3a792e910a81d498ab78158c6ea339424314ec993c746f7' cpus: 1 mem_limit: '7g' volumes: @@ -712,7 +712,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:6.8.0@sha256:93a068fc038a6737741d245476905e67529898564fa135a8862a0ea93ffcb076' cpus: 1 mem_limit: '7g' volumes: @@ -727,7 +727,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:6.8.0@sha256:3210c0f0b86c42ae4afc636d3b0b144f5b1af58a35d93d62790c536b34ce6a0d' 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 c7fc82486..2f29ca239 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:6.8.0@sha256:ace907dcaf49502ba9d9aba83c6bc332c90848ec756f98e23a6f7376a518b0e3' 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 29e925ca1..ad424575a 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:6.8.0@sha256:1bee55a93daa61d428a12cf50e58dd13cec94c35218fbaecf272a476fa0cd37f' cpus: 0.5 mem_limit: '512m' ports: