From 8fb5df0d65db1b8043b23c2be98ef699c11212a8 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Thu, 23 Oct 2025 11:14:22 -0700 Subject: [PATCH 1/3] Update compose images to v6.9.391 --- .../db-only-migrate.docker-compose.yaml | 4 +- docker-compose/docker-compose.yaml | 52 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml index d8277e7b2..eb823a6f9 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.9.391@sha256:967419240a7da0d6d5df95ff0e3015114a827e11690cd4b5baad619ff82bee6d' 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.9.391@sha256:967419240a7da0d6d5df95ff0e3015114a827e11690cd4b5baad619ff82bee6d' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 60403932f..b0d73d687 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.9.391@sha256:86a5b3bc2061061472306ebd5776f7abdf49c0cff418ad2b4e1de471cc413e62' 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.9.391@sha256:17eea4c492397c95019d16707c62d024a19595484a91cbd5e92a517773c3683f' 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.9.391@sha256:222a0d8b8ad4de554d35c6499b67d94e206e9883403d6c110c9beb2ebfffb20b' 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.9.391@sha256:222a0d8b8ad4de554d35c6499b67d94e206e9883403d6c110c9beb2ebfffb20b' 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.9.391@sha256:3571cbf3803e08faff07b95a0f07652510e98631db2cf50785639c1f89984919' 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.9.391@sha256:47dfb8143125b3998f2a2dcfa6f4b3d927956e75dbe98327efe291be1f7ac2b0' 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.9.391@sha256:592b89f750796345d4f619bcc9cf3055ab37713609cfc689bb462157b11df455' 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.9.391@sha256:df2cd81a91637f36193660822b37c95549ff33add4d3d11e5038474cff38bf61' 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.9.391@sha256:904219cc857b5a31c10bfe567803b4d678926f0545c6d20b6160e3a1f39f01dc' 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.9.391@sha256:688ecad3ab7488e2e7b049b6977a5993d1eef99fb94f31ec67ac1a418db8d6da' 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.9.391@sha256:6c54a10e6c6a44cccf6062d80935b315590be2ded376d20ed7764a24501a8d9d' 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.9.391@sha256:24304b74c2a66a0894d6ba3e9203b2218ab2350b2dce7fb2df4786147ff7dcf4' 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.9.391@sha256:6f2ff20bda3a9421e18e92b4d8552f9ca9a6e0d1bbd225c25b677ad6023d474b' 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.9.391@sha256:420c512256273a460db89762f85b2ad65a4a76706516feb4e2183466c4edc078' 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.9.391@sha256:0dad6b4781fecd637d2a716248354cbd0af9505e7429405f96535f348f54ea72' 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.9.391@sha256:ec0c7dbc436bb7bafc7987d6ee25e75093ebc926df2afdac5fa44527c93e6393' 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.9.391@sha256:967419240a7da0d6d5df95ff0e3015114a827e11690cd4b5baad619ff82bee6d' 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.9.391@sha256:dafc60c994086300a1969b93cc2bdc07025261b9e04a0c3ff7d88e0513d029ec' 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.9.391@sha256:967419240a7da0d6d5df95ff0e3015114a827e11690cd4b5baad619ff82bee6d' 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.9.391@sha256:dafc60c994086300a1969b93cc2bdc07025261b9e04a0c3ff7d88e0513d029ec' 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.9.391@sha256:c5104faff410e059362d34bebcc3d4348e6222c4a814a14719f4ca9cad776217' 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.9.391@sha256:dafc60c994086300a1969b93cc2bdc07025261b9e04a0c3ff7d88e0513d029ec' 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.9.391@sha256:4e13c6bb6d99917db9e8e24deda70f3ef20471b72ab655bd2137f04ab3799211' 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.9.391@sha256:7ddb02c3560277ccb76f1ab1f185b9a0cee300a21e74ca33f4ceecc7924ffc73' 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.9.391@sha256:ba2d6f93e784e712a0ae5a4121dc1f0c48e3d098464f0ce86bf7d629a95e960c' 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.9.391@sha256:24648b31fa1e09d4ef5600b93faa793aad3372b15f83d5d2153b3d05cef1e79d' cpus: 1 mem_limit: '1g' networks: From 30e9bb083c8a4e6f79a438400ba24b0de7648115 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Thu, 23 Oct 2025 11:14:42 -0700 Subject: [PATCH 2/3] Update shell images to v6.9.391 --- pure-docker/deploy-blobstore.sh | 0 pure-docker/deploy-caddy.sh | 0 pure-docker/deploy-cadvisor.sh | 0 pure-docker/deploy-codeinsights-db.sh | 0 pure-docker/deploy-codeintel-db.sh | 0 pure-docker/deploy-frontend-internal.sh | 0 pure-docker/deploy-frontend.sh | 0 pure-docker/deploy-gitserver.sh | 0 pure-docker/deploy-grafana.sh | 0 pure-docker/deploy-migrator.sh | 0 pure-docker/deploy-node-exporter.sh | 0 pure-docker/deploy-otel-collector.sh | 0 pure-docker/deploy-pgsql.sh | 0 pure-docker/deploy-precise-code-intel-worker.sh | 0 pure-docker/deploy-prometheus.sh | 0 pure-docker/deploy-redis-cache.sh | 0 pure-docker/deploy-redis-store.sh | 0 pure-docker/deploy-searcher.sh | 0 pure-docker/deploy-syntactic-code-intel-worker.sh | 0 pure-docker/deploy-syntect-server.sh | 0 pure-docker/deploy-worker.sh | 0 pure-docker/deploy-zoekt-indexserver.sh | 0 pure-docker/deploy-zoekt-webserver.sh | 0 pure-docker/deploy.sh | 0 pure-docker/ensure-volume.sh | 0 pure-docker/init-jaeger-cassandra-schema.sh | 0 pure-docker/replicas.sh | 0 pure-docker/teardown.sh | 0 28 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 pure-docker/deploy-blobstore.sh mode change 100755 => 100644 pure-docker/deploy-caddy.sh mode change 100755 => 100644 pure-docker/deploy-cadvisor.sh mode change 100755 => 100644 pure-docker/deploy-codeinsights-db.sh mode change 100755 => 100644 pure-docker/deploy-codeintel-db.sh mode change 100755 => 100644 pure-docker/deploy-frontend-internal.sh mode change 100755 => 100644 pure-docker/deploy-frontend.sh mode change 100755 => 100644 pure-docker/deploy-gitserver.sh mode change 100755 => 100644 pure-docker/deploy-grafana.sh mode change 100755 => 100644 pure-docker/deploy-migrator.sh mode change 100755 => 100644 pure-docker/deploy-node-exporter.sh mode change 100755 => 100644 pure-docker/deploy-otel-collector.sh mode change 100755 => 100644 pure-docker/deploy-pgsql.sh mode change 100755 => 100644 pure-docker/deploy-precise-code-intel-worker.sh mode change 100755 => 100644 pure-docker/deploy-prometheus.sh mode change 100755 => 100644 pure-docker/deploy-redis-cache.sh mode change 100755 => 100644 pure-docker/deploy-redis-store.sh mode change 100755 => 100644 pure-docker/deploy-searcher.sh mode change 100755 => 100644 pure-docker/deploy-syntactic-code-intel-worker.sh mode change 100755 => 100644 pure-docker/deploy-syntect-server.sh mode change 100755 => 100644 pure-docker/deploy-worker.sh mode change 100755 => 100644 pure-docker/deploy-zoekt-indexserver.sh mode change 100755 => 100644 pure-docker/deploy-zoekt-webserver.sh mode change 100755 => 100644 pure-docker/deploy.sh mode change 100755 => 100644 pure-docker/ensure-volume.sh mode change 100755 => 100644 pure-docker/init-jaeger-cassandra-schema.sh mode change 100755 => 100644 pure-docker/replicas.sh mode change 100755 => 100644 pure-docker/teardown.sh diff --git a/pure-docker/deploy-blobstore.sh b/pure-docker/deploy-blobstore.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-caddy.sh b/pure-docker/deploy-caddy.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-cadvisor.sh b/pure-docker/deploy-cadvisor.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-codeinsights-db.sh b/pure-docker/deploy-codeinsights-db.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-codeintel-db.sh b/pure-docker/deploy-codeintel-db.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-frontend-internal.sh b/pure-docker/deploy-frontend-internal.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-frontend.sh b/pure-docker/deploy-frontend.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-gitserver.sh b/pure-docker/deploy-gitserver.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-grafana.sh b/pure-docker/deploy-grafana.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-migrator.sh b/pure-docker/deploy-migrator.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-node-exporter.sh b/pure-docker/deploy-node-exporter.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-otel-collector.sh b/pure-docker/deploy-otel-collector.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-pgsql.sh b/pure-docker/deploy-pgsql.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-precise-code-intel-worker.sh b/pure-docker/deploy-precise-code-intel-worker.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-prometheus.sh b/pure-docker/deploy-prometheus.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-redis-cache.sh b/pure-docker/deploy-redis-cache.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-redis-store.sh b/pure-docker/deploy-redis-store.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-searcher.sh b/pure-docker/deploy-searcher.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-syntactic-code-intel-worker.sh b/pure-docker/deploy-syntactic-code-intel-worker.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-syntect-server.sh b/pure-docker/deploy-syntect-server.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-worker.sh b/pure-docker/deploy-worker.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-zoekt-indexserver.sh b/pure-docker/deploy-zoekt-indexserver.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy-zoekt-webserver.sh b/pure-docker/deploy-zoekt-webserver.sh old mode 100755 new mode 100644 diff --git a/pure-docker/deploy.sh b/pure-docker/deploy.sh old mode 100755 new mode 100644 diff --git a/pure-docker/ensure-volume.sh b/pure-docker/ensure-volume.sh old mode 100755 new mode 100644 diff --git a/pure-docker/init-jaeger-cassandra-schema.sh b/pure-docker/init-jaeger-cassandra-schema.sh old mode 100755 new mode 100644 diff --git a/pure-docker/replicas.sh b/pure-docker/replicas.sh old mode 100755 new mode 100644 diff --git a/pure-docker/teardown.sh b/pure-docker/teardown.sh old mode 100755 new mode 100644 From f8904b375dfefd2a0ee289db36040030c77d20c4 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Thu, 23 Oct 2025 11:14:44 -0700 Subject: [PATCH 3/3] release: v6.9.391 {"version":"v6.9.391","inputs":"server=v6.9.391","type":"patch"}