(internal) release: build v7.1.2426

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.1.2426@sha256:ddf421767125cb5ba492a5915875d140452961fdaadd5e42d541744a93162aa5'
     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.1.2426@sha256:ddf421767125cb5ba492a5915875d140452961fdaadd5e42d541744a93162aa5'
     cpus: 4
     mem_limit: '2g'
     healthcheck:

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.1.2426@sha256:1a0374787193d4fb2d86dfbb2f63597e10da417cc408111ddeea58d435212221'
     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.1.2426@sha256:a27841b049f8c4e374d986c545e45b88c892b66719618c65b354041746113f40'
     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.1.2426@sha256:a5d9c0e2ca1385478168f2e37b535f440b796f8c4c91bb21e57cc6aa55017bb5'
     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.1.2426@sha256:a5d9c0e2ca1385478168f2e37b535f440b796f8c4c91bb21e57cc6aa55017bb5'
     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.1.2426@sha256:66b967f16de938badc81046c5f34f6e5506ea63567faff015f85468a46983838'
     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.1.2426@sha256:63199db1a5be7ac4e6ab15de6dab317821f4256030ec0b32834123ab771df7fd'
     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.1.2426@sha256:d6edd6350a711e0683655523f20891175863d69dad0626d44e4fb8bbbfafdd82'
     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.1.2426@sha256:6862c5a7c706a74d323f4bab6a3240795be05189d927342f0d2f6628a0dc58f0'
     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.1.2426@sha256:1bded50154970f4aea0eeb83fbe0878f45bb943fdea55a3224e5ebcaa30cd3d6'
     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.1.2426@sha256:0328b0c28c438980d0b3b6a32841819f7c3c0f54fc6ed905c3b79b7ba91d71ac'
     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.1.2426@sha256:1ede4a4267e81ababaed5baa034d80ffe6003965368b825db504fd2e349b0bf2'
     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.1.2426@sha256:4fada91bdee2b505e243febfbbb3397b4e1dae812a06daf9c9ee39100cbcedd6'
     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.1.2426@sha256:ad7f483e84ed34b0677a361bca542cc6db50b97c1fafc9b2ed87902c613bb7f9'
     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.1.2426@sha256:511b7625de0279cfc882c4cbbedbbd3af0643aa7056d86243d7d9c830b46dec8'
     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.1.2426@sha256:0d18f257645143c62b3f570419c3629ad61b976cf9cfe0602a4da74913062947'
     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.1.2426@sha256:d440c196d6abf104de1e1e12f9889c3a074f70ca3f68f7631737f179b24d0b77'
     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.1.2426@sha256:ddf421767125cb5ba492a5915875d140452961fdaadd5e42d541744a93162aa5'
     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.1.2426@sha256:7d4993ecd62b6cab7dfc755c5ec2972f9fa6837a3358cbaece75a1b75192db3c'
     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.1.2426@sha256:ddf421767125cb5ba492a5915875d140452961fdaadd5e42d541744a93162aa5'
     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.1.2426@sha256:7d4993ecd62b6cab7dfc755c5ec2972f9fa6837a3358cbaece75a1b75192db3c'
     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.1.2426@sha256:baf4981054efb9cd4c48949aa02b48c84e8c2a98253eb914ed47f2aed91386cd'
     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.1.2426@sha256:7d4993ecd62b6cab7dfc755c5ec2972f9fa6837a3358cbaece75a1b75192db3c'
     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.1.2426@sha256:bdfdd541cd43dd5541f9035ffbf9c8df5ca42b4d54c42758eefdd06e584b524c'
     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.1.2426@sha256:48683844e3b7600d28a9f0c0d4a645d4ca11d9b42b77607ac79e64d605c748fd'
     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.1.2426@sha256:9f6fe32ab18ae4c07a087b7995236b49b583a92243403051f44b9174ad9b5a55'
     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.1.2426@sha256:b0a7c9f1aaf0a6031d0bb2ca337a73a914ab7373819564c4111b7e1b17556827'
     cpus: 1
     mem_limit: '1g'
     networks:

docker-compose/jaeger/docker-compose.yaml

@@ -1,10 +1,10 @@
 version: '2.4'
 services:
   # Description: Jaeger all-in-one instance
-  # (https://www.jaegertracing.io/docs/1.17/getting-started/#all-in-one) for distributed tracing.
+  # (https://www.jaegertracing.io/docs/2.16/getting-started/) for distributed tracing.
   #
   # Disk: none
-  # Ports exposed to other Sourcegraph services: 5778/TCP 6831/UDP 6832/UDP 14250/TCP 4317/UDP 4321/UDP
+  # Ports exposed to other Sourcegraph services: 5778/TCP 4317/TCP 4318/TCP
   # Ports exposed to the public internet: none
   # Ports exposed to site admins only: 16686/HTTP
   #
@@ -16,23 +16,15 @@ services:
     ports:
       # Query port
       - '0.0.0.0:16686:16686'
-      # Collector port
-      - '0.0.0.0:14250:14250'
-      - '0.0.0.0:4317:4317' # gRPC port
-      - '0.0.0.0:4321:4321' # HTTP port
-      # Agent ports
+      # OTLP ports
+      - '0.0.0.0:4317:4317' # gRPC
+      - '0.0.0.0:4318:4318' # HTTP
+      # Remote sampling
       - '0.0.0.0:5778:5778'
-      - '0.0.0.0:6831:6831'
-      - '0.0.0.0:6832:6832'
     networks:
       - sourcegraph
     restart: always
-    command: ['--memory.max-traces=20000', "--sampling.strategies-file=/etc/jaeger/sampling_strategies.json", "--collector.otlp.enabled" ]
-    environment:
-      - 'SAMPLING_STRATEGIES_FILE=/etc/jaeger/sampling_strategies.json'
-      - 'COLLECTOR_OTLP_ENABLED=true'
-      - 'JAEGER_OTLP_GRPC_PORT=4317'
-      - 'JAEGER_OTLP_HTTP_PORT=4321'
+    command: ['--config=/etc/jaeger/jaeger-config.yaml']
 
   # Configure collector to send traces to Jaeger
   otel-collector: