From f3e26648704db462607c6353fb0ab689ac486183 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 25 Nov 2024 14:22:54 -0800 Subject: [PATCH 1/3] fix: use postgresql 16 images (#1116) We need to use the new postgresql images ### Checklist * [x] Sister [deploy-sourcegraph](https://github.com/sourcegraph/deploy-sourcegraph) change: * [x] Sister [customer-replica](https://github.com/sourcegraph/deploy-sourcegraph-docker-customer-replica-1) change (if necessary, for any changes affecting pure-docker or configuration): * [x] All images have a valid tag and SHA256 sum ### Test plan CI --- docker-compose/docker-compose.yaml | 6 +++--- pure-docker/deploy-codeinsights-db.sh | 22 +++++++++++----------- pure-docker/deploy-codeintel-db.sh | 16 ++++++++-------- pure-docker/deploy-pgsql.sh | 16 ++++++++-------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 7f04860ca..fe962f16b 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -553,7 +553,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgres-12-alpine:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8' + image: 'index.docker.io/sourcegraph/postgresql-16:insiders' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -600,7 +600,7 @@ services: # codeintel-db: container_name: codeintel-db - image: 'index.docker.io/sourcegraph/codeintel-db:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8' + image: 'index.docker.io/sourcegraph/postgresql-16:insiders' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -647,7 +647,7 @@ services: # codeinsights-db: container_name: codeinsights-db - image: 'index.docker.io/sourcegraph/codeinsights-db:5.9.1590@sha256:4e75b2c463ce1ef3bfeec4bb71a16693df02005e66b9e697859ce61064e08f42' + image: 'index.docker.io/sourcegraph/postgresql-16-codeinsights:insiders' cpus: 4 mem_limit: '2g' shm_size: '1g' diff --git a/pure-docker/deploy-codeinsights-db.sh b/pure-docker/deploy-codeinsights-db.sh index 9cb79f2b6..22628d77c 100755 --- a/pure-docker/deploy-codeinsights-db.sh +++ b/pure-docker/deploy-codeinsights-db.sh @@ -13,17 +13,17 @@ VOLUME="$HOME/sourcegraph-docker/codeinsights-db-disk" ./ensure-volume.sh $VOLUME 999 docker run --detach \ - --name=codeinsights-db \ - --network=sourcegraph \ - --restart=always \ - --cpus=4 \ - --memory=2g \ - -e POSTGRES_DB=postgres \ - -e POSTGRES_PASSWORD=password \ - -e POSTGRES_USER=postgres \ - -e PGDATA=/var/lib/postgresql/data/pgdata \ - -v $VOLUME:/var/lib/postgresql/data/ \ - index.docker.io/sourcegraph/codeinsights-db:187572_2022-12-06_cbecc5321c7d@sha256:4dd89a1279e7d55ddcb5b570d0bb544422dd1ecb0e3662f23d22f9643837c2b5 + --name=codeinsights-db \ + --network=sourcegraph \ + --restart=always \ + --cpus=4 \ + --memory=2g \ + -e POSTGRES_DB=postgres \ + -e POSTGRES_PASSWORD=password \ + -e POSTGRES_USER=postgres \ + -e PGDATA=/var/lib/postgresql/data/pgdata \ + -v $VOLUME:/var/lib/postgresql/data/ \ + index.docker.io/sourcegraph/postgresql-16-codeinsights:insiders # Sourcegraph requires PostgreSQL 12+. Generally newer versions are better, # but anything 12 and higher is supported. diff --git a/pure-docker/deploy-codeintel-db.sh b/pure-docker/deploy-codeintel-db.sh index 0787e707e..c5a550cce 100755 --- a/pure-docker/deploy-codeintel-db.sh +++ b/pure-docker/deploy-codeintel-db.sh @@ -12,14 +12,14 @@ set -e VOLUME="$HOME/sourcegraph-docker/codeintel-db-disk" ./ensure-volume.sh $VOLUME 999 docker run --detach \ - --name=codeintel-db \ - --network=sourcegraph \ - --restart=always \ - --cpus=4 \ - --memory=2g \ - -e PGDATA=/var/lib/postgresql/data/pgdata \ - -v $VOLUME:/var/lib/postgresql/data/ \ - index.docker.io/sourcegraph/codeintel-db:187572_2022-12-06_cbecc5321c7d@sha256:7fb02a9392ce4dd3d4210dbd5792c09c4210a2dfc6dc389ed679137784359102 + --name=codeintel-db \ + --network=sourcegraph \ + --restart=always \ + --cpus=4 \ + --memory=2g \ + -e PGDATA=/var/lib/postgresql/data/pgdata \ + -v $VOLUME:/var/lib/postgresql/data/ \ + index.docker.io/sourcegraph/postgresql-16:insiders # Sourcegraph requires PostgreSQL 12+. Generally newer versions are better, # but anything 12 and higher is supported. diff --git a/pure-docker/deploy-pgsql.sh b/pure-docker/deploy-pgsql.sh index 432b53c3d..cf7f670ac 100755 --- a/pure-docker/deploy-pgsql.sh +++ b/pure-docker/deploy-pgsql.sh @@ -12,14 +12,14 @@ set -e VOLUME="$HOME/sourcegraph-docker/pgsql-disk" ./ensure-volume.sh $VOLUME 999 docker run --detach \ - --name=pgsql \ - --network=sourcegraph \ - --restart=always \ - --cpus=4 \ - --memory=2g \ - -e PGDATA=/var/lib/postgresql/data/pgdata \ - -v $VOLUME:/var/lib/postgresql/data/ \ - index.docker.io/sourcegraph/postgres-12-alpine:187572_2022-12-06_cbecc5321c7d@sha256:44f6e9a51fafb99573cbd767f20f68913db5a02920c5974e4fa560735d745328 + --name=pgsql \ + --network=sourcegraph \ + --restart=always \ + --cpus=4 \ + --memory=2g \ + -e PGDATA=/var/lib/postgresql/data/pgdata \ + -v $VOLUME:/var/lib/postgresql/data/ \ + index.docker.io/sourcegraph/postgresql-16:insiders # Sourcegraph requires PostgreSQL 12+. Generally newer versions are better, # but anything 12 and higher is supported. From 16cb493adcc9b52f6be560a993740e961244ea72 Mon Sep 17 00:00:00 2001 From: Jacob Pleiness Date: Thu, 19 Dec 2024 02:43:27 +0000 Subject: [PATCH 2/3] release_patch: v5.10.3940 {"version":"v5.10.3940","inputs":"server=5.10.3940","type":"patch"} --- .../db-only-migrate.docker-compose.yaml | 4 +- docker-compose/docker-compose.yaml | 54 +++++++++---------- .../executors/executor.docker-compose.yaml | 2 +- docker-compose/jaeger/docker-compose.yaml | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml index ebbb4b5cf..3f9c2d657 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/postgres-12-alpine:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres-12-alpine:5.10.3940@sha256:69d0ba6f70efb3fc6343f8ab86d9927252e042be5b8421c7604860557b95d39a' cpus: 4 mem_limit: '2g' healthcheck: @@ -30,7 +30,7 @@ services: codeintel-db: container_name: codeintel-db - image: 'index.docker.io/sourcegraph/codeintel-db:5.9.1590@sha256:3d5dd36e3af6b643903f507422be19ed1cb1f5f71c4541572d4a8a252e81aeb8' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/codeintel-db:5.10.3940@sha256:69d0ba6f70efb3fc6343f8ab86d9927252e042be5b8421c7604860557b95d39a' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index fe962f16b..67851b9fe 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:5.9.1590@sha256:7031d742e1eeb7843aa9a9af4165c96b59776da0d630742b77fb805f12864ac6' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/migrator:5.10.3940@sha256:245c8eac0316a50c169239054aeb1695874b225f84010963bd115aba9fdd787f' 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:5.9.1590@sha256:2ce418076ccc4f0d75bab18a587f8a3853f5e02daaf1f3946232f3dea399c05a' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/caddy:5.10.3940@sha256:f7c7d6d7ad502cbb88a07218faef274048f76775bbe9871146ada9b2de3bcefb' 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:5.9.1590@sha256:8ee5bf8cf1addad9c9165681a162be6f695bfa823a9cb97114758a849a39892c' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:5.10.3940@sha256:51b11424f7bd0f33278e71525b75f645031a12aed75f696d9479399d476f6dca' cpus: 4 mem_limit: '8g' environment: @@ -180,7 +180,7 @@ services: # sourcegraph-frontend-internal: container_name: sourcegraph-frontend-internal - image: 'index.docker.io/sourcegraph/frontend:5.9.1590@sha256:8ee5bf8cf1addad9c9165681a162be6f695bfa823a9cb97114758a849a39892c' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:5.10.3940@sha256:51b11424f7bd0f33278e71525b75f645031a12aed75f696d9479399d476f6dca' cpus: 4 mem_limit: '8g' environment: @@ -227,7 +227,7 @@ services: # gitserver-0: container_name: gitserver-0 - image: 'index.docker.io/sourcegraph/gitserver:5.9.1590@sha256:63ab3a2dbd3bc678e4bdd313bcaa277607a8cf2d88e82897d043a070a7da7471' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/gitserver:5.10.3940@sha256:5c282b0ddd3b940afdad676a159c311a2944be3d9aa2c604e036ac945dd5cede' cpus: 4 mem_limit: '8g' environment: @@ -250,7 +250,7 @@ services: # zoekt-indexserver-0: container_name: zoekt-indexserver-0 - image: 'index.docker.io/sourcegraph/search-indexer:5.9.1590@sha256:93a61fc432c7776144c1bff3c682143b6a2634acf64d9d5c5ab857c72810bc35' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/search-indexer:5.10.3940@sha256:c8d0656f651a4695f5c3eaf0f67dea832dae93ef30f8f21c43d326c8de32d7bd' cpus: 8 mem_limit: '16g' environment: @@ -273,7 +273,7 @@ services: # zoekt-webserver-0: container_name: zoekt-webserver-0 - image: 'index.docker.io/sourcegraph/indexed-searcher:5.9.1590@sha256:49499a9b8eda091f6cbe41058e1701994dd09ffbb9de2dddde34943db32643c3' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/indexed-searcher:5.10.3940@sha256:13f4a3eaa849763780822b3b44397f3fd48f887c1fb2f0354193b827739dcc8b' cpus: 8 mem_limit: '50g' environment: @@ -300,7 +300,7 @@ services: # searcher-0: container_name: searcher-0 - image: 'index.docker.io/sourcegraph/searcher:5.9.1590@sha256:76173ca0542622c390c5ae2af2cf8e40a9b175f01dc4a9c931285ac2cfd88854' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/searcher:5.10.3940@sha256:29a79695f2426385402920c1d3e1c6483f65b4fe1e3e79fbe5f6a752ba8c5529' cpus: 2 mem_limit: '2g' environment: @@ -324,7 +324,7 @@ services: # precise-code-intel-worker: container_name: precise-code-intel-worker - image: 'index.docker.io/sourcegraph/precise-code-intel-worker:5.9.1590@sha256:3f0257b29bc7b79a05701d33e4d1b14998a33254644fe478569ee23b9ec229be' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/precise-code-intel-worker:5.10.3940@sha256:3f4fa259d6dac9af170b71a2d264bd54d1ec8e5300f00ee189da880ac599c279' cpus: 2 mem_limit: '4g' environment: @@ -350,7 +350,7 @@ services: # repo-updater: container_name: repo-updater - image: 'index.docker.io/sourcegraph/repo-updater:5.9.1590@sha256:d8ec1e1487ed803d07f9fb0dfa2db0a4a637871fa7ba778378749a398de724d9' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/repo-updater:5.10.3940@sha256:4413bf60e5f2c788c0c3a19022fef6d425accea59d434eaa14a7b5e232f3a556' cpus: 4 mem_limit: '4g' environment: @@ -370,7 +370,7 @@ services: # worker: container_name: worker - image: 'index.docker.io/sourcegraph/worker:5.9.1590@sha256:b258021d297a7a562982a5606507d4e4ddb27ebe010f3fdbbda20ab7f0a9f4fc' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/worker:5.10.3940@sha256:bed119e5c5fa756885ae86f19c3880cc2c91b632d2e2944c10c33cfa2b1faf35' cpus: 4 mem_limit: '4g' environment: @@ -396,7 +396,7 @@ services: # syntect-server: container_name: syntect-server - image: 'index.docker.io/sourcegraph/syntax-highlighter:5.9.1590@sha256:7a15d6fd63d0d6a39f9066209f3c406674b41cf1d365e172cc30cd877e7c0885' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntax-highlighter:5.10.3940@sha256:3d90fe310d3c6d7a5f9f697b3d4c5416f5429128f3a26dc1ee34ca73d3373a23' cpus: 4 mem_limit: '6g' healthcheck: @@ -417,7 +417,7 @@ services: # symbols-0: container_name: symbols-0 - image: 'index.docker.io/sourcegraph/symbols:5.9.1590@sha256:f4c570b42fbdedc132010c94f1d20fa286c09b255b4bc57e51885b41dd4ea886' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/symbols:5.10.3940@sha256:487cbe050d5e24216a9012f4ef4607836471af3b58488659bf29f04baed69862' cpus: 2 mem_limit: '4g' environment: @@ -443,7 +443,7 @@ services: # prometheus: container_name: prometheus - image: 'index.docker.io/sourcegraph/prometheus:5.9.1590@sha256:c05d053c0a4faaf8f814996bb922fd74784cc6853dd23a33e4df61e56262ac44' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/prometheus:5.10.3940@sha256:1dc99444832676a65d3ba9564c4ef83a425239593c50570793c66e663b29b161' cpus: 4 mem_limit: '8g' volumes: @@ -470,7 +470,7 @@ services: # 'GF_SERVER_ROOT_URL='https://grafana.example.com' grafana: container_name: grafana - image: 'index.docker.io/sourcegraph/grafana:5.9.1590@sha256:ac4e6f2ab247165ee07314f8947d32a9df5bef4a24e73413b3b3664da870954f' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/grafana:5.10.3940@sha256:db40cc99cd2e094666308b1ab34f120d1857001f71c464143b1da898b1d442df' cpus: 1 mem_limit: '1g' volumes: @@ -491,7 +491,7 @@ services: # cadvisor: container_name: cadvisor - image: 'index.docker.io/sourcegraph/cadvisor:5.9.1590@sha256:406a3e6b0ca6384008be43c9b87c761c8e98737f2294af92bcaa2a35a563e63e' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/cadvisor:5.10.3940@sha256:a48ec43a9af42dddcd4f64ff95181892f7e53b8d9225017e4638b4028a41623c' cpus: 1 mem_limit: '1g' # You may set `privileged` to `false and `cadvisor` will run with reduced privileges. @@ -524,7 +524,7 @@ services: # node-exporter: container_name: node-exporter - image: 'index.docker.io/sourcegraph/node-exporter:5.9.1590@sha256:5a7d2c0b90a86dfb852053e0af4b6b701606dc4e4f69b15411fe9d123198ff2b' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/node-exporter:5.10.3940@sha256:54d57f4e8e9e9a4f4fa0003ff256cd395740e0ba7dcd5d580df105037192a465' cpus: .5 mem_limit: '1g' pid: 'host' @@ -553,7 +553,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgresql-16:insiders' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:5.10.3940@sha256:477d377c941a6bb2a1ff36bbdb000dace13417567175ce3e5e6d1b1c287b256d' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -581,7 +581,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:5.9.1590@sha256:ebf5dd7809ae10b617d497f71f430022f88dcab92b55fb4c58df60c43345ab34' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.10.3940@sha256:4af8dfdc69f3bd8100902a1408a54ec3119d81cd25c55bb031b8dbb4e497c182' cpus: 0.1 mem_limit: '50m' networks: @@ -600,7 +600,7 @@ services: # codeintel-db: container_name: codeintel-db - image: 'index.docker.io/sourcegraph/postgresql-16:insiders' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:5.10.3940@sha256:477d377c941a6bb2a1ff36bbdb000dace13417567175ce3e5e6d1b1c287b256d' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -628,7 +628,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:5.9.1590@sha256:ebf5dd7809ae10b617d497f71f430022f88dcab92b55fb4c58df60c43345ab34' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.10.3940@sha256:4af8dfdc69f3bd8100902a1408a54ec3119d81cd25c55bb031b8dbb4e497c182' cpus: 0.1 mem_limit: '50m' networks: @@ -647,7 +647,7 @@ services: # codeinsights-db: container_name: codeinsights-db - image: 'index.docker.io/sourcegraph/postgresql-16-codeinsights:insiders' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16-codeinsights:5.10.3940@sha256:1c62c5f406879bf8d17785c571eba9d4e6bed5fe6c5dca4f92d06a33bd14a55b' cpus: 4 mem_limit: '2g' shm_size: '1g' @@ -680,7 +680,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:5.9.1590@sha256:ebf5dd7809ae10b617d497f71f430022f88dcab92b55fb4c58df60c43345ab34' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.10.3940@sha256:4af8dfdc69f3bd8100902a1408a54ec3119d81cd25c55bb031b8dbb4e497c182' cpus: 0.1 mem_limit: '50m' networks: @@ -699,7 +699,7 @@ services: # blobstore: container_name: blobstore - image: 'index.docker.io/sourcegraph/blobstore:5.9.1590@sha256:e0a170cbc4ecab83ed0471273c2632394a602dea1817e698affc72c14c7469ca' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/blobstore:5.10.3940@sha256:c20f4b1e5f0347e6542e71c6f787dced79cd585a574246f99561f32b90e8b780' cpus: 1 mem_limit: '1g' healthcheck: @@ -722,7 +722,7 @@ services: # redis-cache: container_name: redis-cache - image: 'index.docker.io/sourcegraph/redis-cache:5.9.1590@sha256:aca0a5616ef20c955aeca2e71034e0d4dd65e899716cdc08d72ef1ce1fa9564f' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-cache:5.10.3940@sha256:e4e56db2670a279b9d9c00dd4bdb2f0b69955ed139558f9429760d8156c1d02c' cpus: 1 mem_limit: '7g' volumes: @@ -738,7 +738,7 @@ services: # redis-store: container_name: redis-store - image: 'index.docker.io/sourcegraph/redis-store:5.9.1590@sha256:d7d8b5cd4d784b6f8025941701f6db95e0d3ea263e165b611295d30bdc0e6e60' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-store:5.10.3940@sha256:a25ec754ddfa800d12fbd25b06fcbf0f3b3752a0e80b8095e0d3210404b5a6cb' cpus: 1 mem_limit: '7g' volumes: @@ -753,7 +753,7 @@ services: # Ports exposed to the public internet: none otel-collector: container_name: otel-collector - image: 'index.docker.io/sourcegraph/opentelemetry-collector:5.9.1590@sha256:21eb71c47ee13f071e899fd16befd25357449da4fd279a0d0d000b59aa9e3057' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:5.10.3940@sha256:588eb62e63d09870fd63071ff5aa97a5e1accb60a1e6eeb2b5521493b04da606' 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 6a427f370..655fef160 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:5.9.1590@sha256:131141c304cceadcfe7afbe73f909d1202c39140225e3e9476963ffbd9eb3214' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/executor:5.10.3940@sha256:c91d44f817cec4b9707b016c7762c55f1143bafba9c59d82513e044364b04d3c' 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 e3ace7de3..683d6c0e9 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:5.9.1590@sha256:58bf91017d27e766374cfe4c4d526138fad5ca93944ae46aca1760fdbc7edf75' + image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/jaeger-all-in-one:5.10.3940@sha256:6f9a06449195de4f687c6d0cb2ccf97a7f073cd7d6e87380f4d8ab12e3d0db3b' cpus: 0.5 mem_limit: '512m' ports: From 77d46fc28c7a0f22ba14adf5ace8f23fc6760dd6 Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Thu, 19 Dec 2024 05:32:59 +0000 Subject: [PATCH 3/3] promote-release: v5.10.3940 {"version":"v5.10.3940","inputs":"server=5.10.3940","type":"patch"} --- .../db-only-migrate.docker-compose.yaml | 4 +- docker-compose/docker-compose.yaml | 54 +++++++++---------- .../executors/executor.docker-compose.yaml | 2 +- docker-compose/jaeger/docker-compose.yaml | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml index 3f9c2d657..8a4b4d7c1 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: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres-12-alpine:5.10.3940@sha256:69d0ba6f70efb3fc6343f8ab86d9927252e042be5b8421c7604860557b95d39a' + image: 'index.docker.io/sourcegraph/postgres-12-alpine:5.10.3940@sha256:710ff6aa032d599bfeec0f00f44e32e6c7490224d761f0d63747a1606cc52668' cpus: 4 mem_limit: '2g' healthcheck: @@ -30,7 +30,7 @@ services: codeintel-db: container_name: codeintel-db - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/codeintel-db:5.10.3940@sha256:69d0ba6f70efb3fc6343f8ab86d9927252e042be5b8421c7604860557b95d39a' + image: 'index.docker.io/sourcegraph/codeintel-db:5.10.3940@sha256:710ff6aa032d599bfeec0f00f44e32e6c7490224d761f0d63747a1606cc52668' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 67851b9fe..10f957beb 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: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/migrator:5.10.3940@sha256:245c8eac0316a50c169239054aeb1695874b225f84010963bd115aba9fdd787f' + image: 'index.docker.io/sourcegraph/migrator:5.10.3940@sha256:18bc4067db041fc645fdadc8f21aed7e15ebd1a1fc976b3bb5365ef757ce9cd4' cpus: 0.5 mem_limit: '500m' command: ['up'] @@ -69,7 +69,7 @@ services: # https://caddyserver.com/docs/caddyfile caddy: container_name: caddy - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/caddy:5.10.3940@sha256:f7c7d6d7ad502cbb88a07218faef274048f76775bbe9871146ada9b2de3bcefb' + image: 'index.docker.io/sourcegraph/caddy:5.10.3940@sha256:30de4501dd03fa8539ec075ea78a5ad45a08e2d254c934b8085cbdb50df7f571' cpus: 4 mem_limit: '4g' environment: @@ -124,7 +124,7 @@ services: # service. sourcegraph-frontend-0: container_name: sourcegraph-frontend-0 - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:5.10.3940@sha256:51b11424f7bd0f33278e71525b75f645031a12aed75f696d9479399d476f6dca' + image: 'index.docker.io/sourcegraph/frontend:5.10.3940@sha256:655be588c9f83c44d285bc5d86f6d510314bc388145e137245ec74260c66d236' cpus: 4 mem_limit: '8g' environment: @@ -180,7 +180,7 @@ services: # sourcegraph-frontend-internal: container_name: sourcegraph-frontend-internal - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/frontend:5.10.3940@sha256:51b11424f7bd0f33278e71525b75f645031a12aed75f696d9479399d476f6dca' + image: 'index.docker.io/sourcegraph/frontend:5.10.3940@sha256:655be588c9f83c44d285bc5d86f6d510314bc388145e137245ec74260c66d236' cpus: 4 mem_limit: '8g' environment: @@ -227,7 +227,7 @@ services: # gitserver-0: container_name: gitserver-0 - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/gitserver:5.10.3940@sha256:5c282b0ddd3b940afdad676a159c311a2944be3d9aa2c604e036ac945dd5cede' + image: 'index.docker.io/sourcegraph/gitserver:5.10.3940@sha256:d673ac87a8ea13165b633186909beb95909fb295a9a4278b793f169d501b7b38' cpus: 4 mem_limit: '8g' environment: @@ -250,7 +250,7 @@ services: # zoekt-indexserver-0: container_name: zoekt-indexserver-0 - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/search-indexer:5.10.3940@sha256:c8d0656f651a4695f5c3eaf0f67dea832dae93ef30f8f21c43d326c8de32d7bd' + image: 'index.docker.io/sourcegraph/search-indexer:5.10.3940@sha256:58658bd619e3a8a3ff43db153351334b55278de787a8a06e858bfd6394dd1f5e' cpus: 8 mem_limit: '16g' environment: @@ -273,7 +273,7 @@ services: # zoekt-webserver-0: container_name: zoekt-webserver-0 - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/indexed-searcher:5.10.3940@sha256:13f4a3eaa849763780822b3b44397f3fd48f887c1fb2f0354193b827739dcc8b' + image: 'index.docker.io/sourcegraph/indexed-searcher:5.10.3940@sha256:e97119e9b2135209db7cadca3abd6da33359230f4428221450af93a8e9debb09' cpus: 8 mem_limit: '50g' environment: @@ -300,7 +300,7 @@ services: # searcher-0: container_name: searcher-0 - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/searcher:5.10.3940@sha256:29a79695f2426385402920c1d3e1c6483f65b4fe1e3e79fbe5f6a752ba8c5529' + image: 'index.docker.io/sourcegraph/searcher:5.10.3940@sha256:d2185a6f31af43d6a5dc27d7d29ed310c799317c4dafeb216b932fc6d0ba4588' cpus: 2 mem_limit: '2g' environment: @@ -324,7 +324,7 @@ services: # precise-code-intel-worker: container_name: precise-code-intel-worker - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/precise-code-intel-worker:5.10.3940@sha256:3f4fa259d6dac9af170b71a2d264bd54d1ec8e5300f00ee189da880ac599c279' + image: 'index.docker.io/sourcegraph/precise-code-intel-worker:5.10.3940@sha256:77632a53617eac124ec4c54c2b6942e0d51a936b7e83d186b5faeb9766c29a83' cpus: 2 mem_limit: '4g' environment: @@ -350,7 +350,7 @@ services: # repo-updater: container_name: repo-updater - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/repo-updater:5.10.3940@sha256:4413bf60e5f2c788c0c3a19022fef6d425accea59d434eaa14a7b5e232f3a556' + image: 'index.docker.io/sourcegraph/repo-updater:5.10.3940@sha256:e7446d6da6e9ff95123fb8f64242cf319290f140b87f7231c9a62f8361a9eb43' cpus: 4 mem_limit: '4g' environment: @@ -370,7 +370,7 @@ services: # worker: container_name: worker - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/worker:5.10.3940@sha256:bed119e5c5fa756885ae86f19c3880cc2c91b632d2e2944c10c33cfa2b1faf35' + image: 'index.docker.io/sourcegraph/worker:5.10.3940@sha256:b7535d53806ec151956b90f08df8048a7821725b888fb4c0aa8f852915e35b57' cpus: 4 mem_limit: '4g' environment: @@ -396,7 +396,7 @@ services: # syntect-server: container_name: syntect-server - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/syntax-highlighter:5.10.3940@sha256:3d90fe310d3c6d7a5f9f697b3d4c5416f5429128f3a26dc1ee34ca73d3373a23' + image: 'index.docker.io/sourcegraph/syntax-highlighter:5.10.3940@sha256:798eb14d2987992fdff165c18210b63e1a6553efc0c3a2ea3592fc3a129704b4' cpus: 4 mem_limit: '6g' healthcheck: @@ -417,7 +417,7 @@ services: # symbols-0: container_name: symbols-0 - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/symbols:5.10.3940@sha256:487cbe050d5e24216a9012f4ef4607836471af3b58488659bf29f04baed69862' + image: 'index.docker.io/sourcegraph/symbols:5.10.3940@sha256:dd55d009cae48195ef9986b0372d91959bfa5799d52861abe7bffff6610ce890' cpus: 2 mem_limit: '4g' environment: @@ -443,7 +443,7 @@ services: # prometheus: container_name: prometheus - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/prometheus:5.10.3940@sha256:1dc99444832676a65d3ba9564c4ef83a425239593c50570793c66e663b29b161' + image: 'index.docker.io/sourcegraph/prometheus:5.10.3940@sha256:c6e6d5deebf0ab7010ae99cc8b91591f94e8242230785eca89c367e6b5c8afc5' cpus: 4 mem_limit: '8g' volumes: @@ -470,7 +470,7 @@ services: # 'GF_SERVER_ROOT_URL='https://grafana.example.com' grafana: container_name: grafana - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/grafana:5.10.3940@sha256:db40cc99cd2e094666308b1ab34f120d1857001f71c464143b1da898b1d442df' + image: 'index.docker.io/sourcegraph/grafana:5.10.3940@sha256:1aaf6042b88689ccfb98af2f315ebc3cf83d9d08610c09a7d06bcd86a560aa24' cpus: 1 mem_limit: '1g' volumes: @@ -491,7 +491,7 @@ services: # cadvisor: container_name: cadvisor - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/cadvisor:5.10.3940@sha256:a48ec43a9af42dddcd4f64ff95181892f7e53b8d9225017e4638b4028a41623c' + image: 'index.docker.io/sourcegraph/cadvisor:5.10.3940@sha256:f01940736dbbd54087ca9253c8571ad0dda23d2e1a6aa1a23187614aaa478cc0' cpus: 1 mem_limit: '1g' # You may set `privileged` to `false and `cadvisor` will run with reduced privileges. @@ -524,7 +524,7 @@ services: # node-exporter: container_name: node-exporter - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/node-exporter:5.10.3940@sha256:54d57f4e8e9e9a4f4fa0003ff256cd395740e0ba7dcd5d580df105037192a465' + image: 'index.docker.io/sourcegraph/node-exporter:5.10.3940@sha256:6f0ae5e4f03fb200faea1b18800bf591edd270aa54f1bd0bc915b59617a77dc7' cpus: .5 mem_limit: '1g' pid: 'host' @@ -553,7 +553,7 @@ services: # pgsql: container_name: pgsql - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:5.10.3940@sha256:477d377c941a6bb2a1ff36bbdb000dace13417567175ce3e5e6d1b1c287b256d' + image: 'index.docker.io/sourcegraph/postgresql-16:5.10.3940@sha256:cbbd5f147a103b9f8bf6bb3b20f82f0e24a1f7851a4f52717ce39efdb56f7a3d' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -581,7 +581,7 @@ services: # for this container will need to be updated to reflect the new connection information. pgsql-exporter: container_name: pgsql-exporter - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.10.3940@sha256:4af8dfdc69f3bd8100902a1408a54ec3119d81cd25c55bb031b8dbb4e497c182' + image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.3940@sha256:8c78fc1699807ead6385f04fd7f70106f31c22724b24bd8fcf0558b1a1d55d65' cpus: 0.1 mem_limit: '50m' networks: @@ -600,7 +600,7 @@ services: # codeintel-db: container_name: codeintel-db - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16:5.10.3940@sha256:477d377c941a6bb2a1ff36bbdb000dace13417567175ce3e5e6d1b1c287b256d' + image: 'index.docker.io/sourcegraph/postgresql-16:5.10.3940@sha256:cbbd5f147a103b9f8bf6bb3b20f82f0e24a1f7851a4f52717ce39efdb56f7a3d' cpus: 4 mem_limit: '4g' shm_size: '1g' @@ -628,7 +628,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: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.10.3940@sha256:4af8dfdc69f3bd8100902a1408a54ec3119d81cd25c55bb031b8dbb4e497c182' + image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.3940@sha256:8c78fc1699807ead6385f04fd7f70106f31c22724b24bd8fcf0558b1a1d55d65' cpus: 0.1 mem_limit: '50m' networks: @@ -647,7 +647,7 @@ services: # codeinsights-db: container_name: codeinsights-db - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgresql-16-codeinsights:5.10.3940@sha256:1c62c5f406879bf8d17785c571eba9d4e6bed5fe6c5dca4f92d06a33bd14a55b' + image: 'index.docker.io/sourcegraph/postgresql-16-codeinsights:5.10.3940@sha256:9059c6ee96647eccad26179e8c815e8be63cf704f96be8a1c874c27a454ca147' cpus: 4 mem_limit: '2g' shm_size: '1g' @@ -680,7 +680,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: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/postgres_exporter:5.10.3940@sha256:4af8dfdc69f3bd8100902a1408a54ec3119d81cd25c55bb031b8dbb4e497c182' + image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.3940@sha256:8c78fc1699807ead6385f04fd7f70106f31c22724b24bd8fcf0558b1a1d55d65' cpus: 0.1 mem_limit: '50m' networks: @@ -699,7 +699,7 @@ services: # blobstore: container_name: blobstore - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/blobstore:5.10.3940@sha256:c20f4b1e5f0347e6542e71c6f787dced79cd585a574246f99561f32b90e8b780' + image: 'index.docker.io/sourcegraph/blobstore:5.10.3940@sha256:ee7806dae55c346f2cd159b606be94a69a746b96df9f504e8a62066abe8ee08e' cpus: 1 mem_limit: '1g' healthcheck: @@ -722,7 +722,7 @@ services: # redis-cache: container_name: redis-cache - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-cache:5.10.3940@sha256:e4e56db2670a279b9d9c00dd4bdb2f0b69955ed139558f9429760d8156c1d02c' + image: 'index.docker.io/sourcegraph/redis-cache:5.10.3940@sha256:941289d4c8123293a54f5bce09eb013192f9064bdc319624b90a79714efeff38' cpus: 1 mem_limit: '7g' volumes: @@ -738,7 +738,7 @@ services: # redis-store: container_name: redis-store - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/redis-store:5.10.3940@sha256:a25ec754ddfa800d12fbd25b06fcbf0f3b3752a0e80b8095e0d3210404b5a6cb' + image: 'index.docker.io/sourcegraph/redis-store:5.10.3940@sha256:6f08fcdbf1a7a7cf8728221d4aa07b776fe707bbf01cb71209471498b9b35ed9' cpus: 1 mem_limit: '7g' volumes: @@ -753,7 +753,7 @@ services: # Ports exposed to the public internet: none otel-collector: container_name: otel-collector - image: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/opentelemetry-collector:5.10.3940@sha256:588eb62e63d09870fd63071ff5aa97a5e1accb60a1e6eeb2b5521493b04da606' + image: 'index.docker.io/sourcegraph/opentelemetry-collector:5.10.3940@sha256:18498529fe1c4f3365185f6989dc9cd5d0125186a147307b2b905c822cf7aadf' 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 655fef160..02522be6a 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: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/executor:5.10.3940@sha256:c91d44f817cec4b9707b016c7762c55f1143bafba9c59d82513e044364b04d3c' + image: 'index.docker.io/sourcegraph/executor:5.10.3940@sha256:80c08159abe59e5c914c8038533a93cb78c90b3f9285d5319431fb334506eaa0' 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 683d6c0e9..9188191b6 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: 'us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal/jaeger-all-in-one:5.10.3940@sha256:6f9a06449195de4f687c6d0cb2ccf97a7f073cd7d6e87380f4d8ab12e3d0db3b' + image: 'index.docker.io/sourcegraph/jaeger-all-in-one:5.10.3940@sha256:d830a8c3e8c2be841de04118664f01710fa75d22f4302351309cb39932eee936' cpus: 0.5 mem_limit: '512m' ports: