From 187991b070a853df18e5073a64a21e5a1a18f899 Mon Sep 17 00:00:00 2001 From: sourcegraph-bot-2 <87207425+sourcegraph-bot-2@users.noreply.github.com> Date: Thu, 25 Jun 2026 00:13:44 +0000 Subject: [PATCH 1/2] Update compose images to v7.4.2513 --- .../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..55e662efd 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:7.4.2513@sha256:c4bf39ef5785bb6cb59ca4b9fe32d2defddcff8322828879cd9cfe4d05273d8d' 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:7.4.2513@sha256:c4bf39ef5785bb6cb59ca4b9fe32d2defddcff8322828879cd9cfe4d05273d8d' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 60403932f..5fb8106d2 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:7.4.2513@sha256:3b3f07a0315fe5a7651f68b6eb59238ed973b04aa6ff460fb2a33287b0bfe9f0' 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:7.4.2513@sha256:5a9f0335f31921a943ce583cffd0eed7c66424a7f1dadf9828fbbbbb99516aaf' 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:7.4.2513@sha256:c2a6129656bfe7343b312f4e4f4f025fa47975452375612cd5871e33b3444732' 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:7.4.2513@sha256:c2a6129656bfe7343b312f4e4f4f025fa47975452375612cd5871e33b3444732' 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:7.4.2513@sha256:9910c2c845e820829d7fca2b0eedddd169979e198d82cf5b6b66d794550be7aa' 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:7.4.2513@sha256:c33f2335eb4c94e0cd636ab4e3f67d1923ecf427d0ba744a7011d7ff3c7468c6' 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:7.4.2513@sha256:54a7acfe50e33607ac7df36108c4ccc0dec477d4c47f1be74b361a74f52ba02d' 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:7.4.2513@sha256:4ca33a387889b381164943abfd84eab4808c0d5f28dab6ba4eae8418d9fe574b' 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:7.4.2513@sha256:d0699b3d9f8c909838cae7164986c436a5fba3809582cebd2b05b922b8dc15e0' 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:7.4.2513@sha256:b61279c99ace1401b8bef60488500c911069513df143f91f81b07544e8cb05b5' 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:7.4.2513@sha256:c6eb974ffc0f54472b54e0431fff90c3c0ae77cedbb3842a6a9d0cfa2dd7548a' 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:7.4.2513@sha256:dcb1ab73470e7b6caeedbc5449880ea3d4cd5941dea0688308bd86dad401f00b' 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:7.4.2513@sha256:89d7f7c7eab0aff3431b4f1f6ca13eb26a5bc63ac07fe84839a17490c87bc585' 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:7.4.2513@sha256:adab221b2f3819a3fdb788ae3db95b282dc2457d02d8c0ef689fffc82adc5f61' 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:7.4.2513@sha256:b9e9b9d35a8afaa1c0e0fe55c64d5092db773f495eede7a46346cd9fed80b02b' 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:7.4.2513@sha256:c004572cfb68005160ff60aca029df45c2375e4af8aab8f2d1f5d167270fe00f' 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:7.4.2513@sha256:c4bf39ef5785bb6cb59ca4b9fe32d2defddcff8322828879cd9cfe4d05273d8d' 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:7.4.2513@sha256:8a05810bedaf331a89e5365ae7d02443b9f51dcb5a022c032dca831008227622' 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:7.4.2513@sha256:c4bf39ef5785bb6cb59ca4b9fe32d2defddcff8322828879cd9cfe4d05273d8d' 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:7.4.2513@sha256:8a05810bedaf331a89e5365ae7d02443b9f51dcb5a022c032dca831008227622' 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:7.4.2513@sha256:6f84d16b77e2e013c4f226654c4c8c851607bc774a8606d6d14934e30eb9a737' 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:7.4.2513@sha256:8a05810bedaf331a89e5365ae7d02443b9f51dcb5a022c032dca831008227622' 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:7.4.2513@sha256:6a5610f8b73e49a7e532956b747b24dcb18824cfcae13c7075ef44d1492cdd7a' 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:7.4.2513@sha256:7c88d1c532ffccf2f7af3971f379a21f0f4191609774814bfba8781ee29fb9fa' 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:7.4.2513@sha256:79ec1590ff0078ee6df1548b8ab6f47a110764afdd4a32fde03f973b9580c25a' 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:7.4.2513@sha256:a45b82f65dc4d531b0a2370d96f9c27315c597f56534cf97e61e5633797239d3' cpus: 1 mem_limit: '1g' networks: From fa8fbaf1b3617aee32edfb14bf6aafe6442dd035 Mon Sep 17 00:00:00 2001 From: sourcegraph-bot-2 <87207425+sourcegraph-bot-2@users.noreply.github.com> Date: Thu, 25 Jun 2026 00:13:45 +0000 Subject: [PATCH 2/2] release: v7.4.2513 {"version":"v7.4.2513","inputs":"server=v7.4.2513","type":"patch"}