diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml index d8277e7b2..06646d62b 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.7.1104@sha256:e504cc8e4500de6e5ad6ea8e78593d7c195868dc44ecc44a51fa1983b5bcd845' 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.7.1104@sha256:e504cc8e4500de6e5ad6ea8e78593d7c195868dc44ecc44a51fa1983b5bcd845' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 60403932f..f8a83fbb2 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.7.1104@sha256:da55e95eedebbc84be8436418aa1b2d8b007c03cb91493047819133354ec49d0' 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.7.1104@sha256:de04756bab048527fce20df315d39a67ca27d56729f5ac724045408465e748e9' 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.7.1104@sha256:c8218b059a08128fae5ab5f5965e6a02f9450f78580ee9e7ab9f9d9a7794512b' 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.7.1104@sha256:c8218b059a08128fae5ab5f5965e6a02f9450f78580ee9e7ab9f9d9a7794512b' 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.7.1104@sha256:365535d31297b5bec031d2e82b61f31fdaae487ca73bed37aacc9789d328aee7' 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.7.1104@sha256:c5892aecfe9218b339e00bdba7510558d9518430ddaca9ecba9ed9cbce61f810' 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.7.1104@sha256:98a0f279abdc7a3378756a0e32e4d221671960ed47fdc12ef53c6839173fb354' 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.7.1104@sha256:19e7dc090d26acc0bb60012a691575b9364c5bef64f207f30490df40ba0261ba' 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.7.1104@sha256:6c4bb35ac4604bf717e163c430d792f3557a9fb13cb6bf65361119fcd56c613d' 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.7.1104@sha256:7c91a5c4d2e07b85959ced9637be8b2a909f4646658ac932f98eeff30ba0d1b6' 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.7.1104@sha256:a39b917ba4f40022eb55b0360b27b58b3694a951e11371a6731f9a5ec75ef88d' 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.7.1104@sha256:a6570d9a442416515a36b1e323010d2adf84d0af8d2043501c39e30053743c0f' 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.7.1104@sha256:1dcf7aa8be0ef2585e56a6dcf81a5b95be5bb13d1df55210da9cb94e4714f8f1' 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.7.1104@sha256:22f0f7435642875f19f7ad17547709eac32ea3bcea2f5cb02776b3b7d1d0b422' 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.7.1104@sha256:45ff72d2e485fa2b8353420db2455943562bc497afb5d6956d8b26f45ac3b606' 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.7.1104@sha256:7a44594cfadf8fcf033ef63feee12985d8a7c76365a75e754f9a4a6a66dd2e16' 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.7.1104@sha256:e504cc8e4500de6e5ad6ea8e78593d7c195868dc44ecc44a51fa1983b5bcd845' 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.7.1104@sha256:a5923d83917e3bb4c3bbe0b4f5bd2f0a4cd26737aa63b6ac02f7e8aeb3fc9b28' 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.7.1104@sha256:e504cc8e4500de6e5ad6ea8e78593d7c195868dc44ecc44a51fa1983b5bcd845' 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.7.1104@sha256:a5923d83917e3bb4c3bbe0b4f5bd2f0a4cd26737aa63b6ac02f7e8aeb3fc9b28' 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.7.1104@sha256:d6e7c87917654ed8abbc2b9f60ab2d4b284f0ba33c8d02ad64cec09dcaf3a79f' 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.7.1104@sha256:a5923d83917e3bb4c3bbe0b4f5bd2f0a4cd26737aa63b6ac02f7e8aeb3fc9b28' 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.7.1104@sha256:99dfed44d6ed08176809ca5e839605527c02257f754a274820c3c8e231ba397a' 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.7.1104@sha256:704b69cf7a0726f0a02bb166b7149406834e21ec92ec5180578837afe413fe9b' 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.7.1104@sha256:3dbdb6db1f4228c335842fa16eba28559636d0a294dd279b60bdc93b80728b71' 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.7.1104@sha256:06bc5952f0d0467daa5cc91fe255025e5ce8c5e45f97282d40d8c007cb167d60' 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..7e1c6e2bf 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.7.1104@sha256:de4e814b81a38d60d7393c7c3cfe3c7325a79065a35c97f00ab48d22021d0791' 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..e08cf324a 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.7.1104@sha256:b23119b1c693dfa48a47023dd243fba6db20ac92629f3e42bde5a72add90a7dd' cpus: 0.5 mem_limit: '512m' ports: diff --git a/release.yaml b/release.yaml index ac3a782a4..75abeeeb7 100644 --- a/release.yaml +++ b/release.yaml @@ -163,12 +163,14 @@ promoteToPublic: - name: docker(compose):tags cmd: | set -eu - registry=index.docker.io/sourcegraph + # Use external GAR registry to get consistent SHA256s after monorepo promotion + registry=us-docker.pkg.dev/sourcegraph-images/external sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/ - name: docker(shell):tags cmd: | set -eu - registry=index.docker.io/sourcegraph + # Use external GAR registry to get consistent SHA256s after monorepo promotion + registry=us-docker.pkg.dev/sourcegraph-images/external sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/ - name: "git:branch" cmd: | @@ -259,13 +261,15 @@ promoteToPublic: - name: docker(compose):tags cmd: | set -eu - registry=index.docker.io/sourcegraph + # Use external GAR registry to maintain consistency with promoted images + registry=us-docker.pkg.dev/sourcegraph-images/external sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/ - name: docker(shell):tags cmd: | set -eu - registry=index.docker.io/sourcegraph + # Use external GAR registry to maintain consistency with promoted images + registry=us-docker.pkg.dev/sourcegraph-images/external sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/ - name: "git:branch"