From f3e26648704db462607c6353fb0ab689ac486183 Mon Sep 17 00:00:00 2001
From: Anish Lakhwara <anish+github@lakhwara.com>
Date: Mon, 25 Nov 2024 14:22:54 -0800
Subject: [PATCH 1/5] fix: use postgresql 16 images (#1116)

We need to use the new postgresql images

### Checklist

<!--
Kubernetes and Docker Compose MUST be kept in sync. You should not merge
a change here
without a corresponding change in the other repository, unless it truly
is specific to
this repository. If uneeded, add link or explanation of why it is not
needed here.
-->
* [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
<!--
As part of SOC2/GN-104 and SOC2/GN-105 requirements, all pull requests
are REQUIRED to
provide a "test plan". A test plan is a loose explanation of what you
have done or
implemented to test this, as outlined in our Testing principles and
guidelines:

https://docs.sourcegraph.com/dev/background-information/testing_principles
  Write your test plan here after the "Test plan" header.
-->
---
 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 c77a81564b133185a21fee112022ca38d7a5ce94 Mon Sep 17 00:00:00 2001
From: Warren Gifford <warrenbruceg@gmail.com>
Date: Thu, 12 Dec 2024 22:52:01 +0000
Subject: [PATCH 2/5] release_patch: v5.10.2832

{"version":"v5.10.2832","inputs":"server=v5.10.2832","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..c169e3f9c 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.2832@sha256:d1518bacdac8f3697d2388da904732dd1ea030b0e0292a0859011349041ea4ad'
     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.2832@sha256:d1518bacdac8f3697d2388da904732dd1ea030b0e0292a0859011349041ea4ad'
     cpus: 4
     mem_limit: '2g'
     healthcheck:
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index fe962f16b..fe2201d05 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.2832@sha256:4b9b5913e30a246f98f537d7b9faeae25be2ff1119b7a8793135dc4d86278c2c'
     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.2832@sha256:afaf94a4313d0f21016bfab8844e305fddd4a6ee6acb274f5bd8ee74b6ffb1a2'
     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.2832@sha256:539c878b3dc4f1d7321b2fa324a4db396fd1182b3c0f3a06ac5b022d8b35feab'
     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.2832@sha256:539c878b3dc4f1d7321b2fa324a4db396fd1182b3c0f3a06ac5b022d8b35feab'
     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.2832@sha256:f535369dcc679afbed47c1890236a871cac6997489ebaa3f4002f97b34418bb3'
     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.2832@sha256:6a5989bcfe42b5863e0018f44e5095f51697154e3fb241ad45003a1715e6b5b6'
     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.2832@sha256:1c112d3dd23d01c659b20e6dfbab671fe71117740f1b496d81c05bb184a77b25'
     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.2832@sha256:1955a760f7188e61e5a4dcb0fb11d4509ca7a3e4c4ff986bb92ce69489295dee'
     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.2832@sha256:8e6d07fa523212409e2b9bb338ea9e6d9ad93989bf7038b8a1c084bf7e3cbb17'
     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.2832@sha256:38f19327ce92d754ffca346a7447bb7899c1143bf31c393b24973cdb9a0b8c4e'
     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.2832@sha256:4883593fbe63de5e195e44a96910d3f8d1993a54225d400af4c14f39afbcf357'
     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.2832@sha256:5a6161eb1993d918bb5aa2ecc75828ae65c7051c8054e62811f57777c1ae4351'
     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.2832@sha256:833b68a349b0cb18c03842753524afa1bf90a99ef21ca2b3619e5da3fc69e85e'
     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.2832@sha256:4d93e03f0c4311fd222469a9ed6c45a2dfcc1b1bb8faee3734c4d091b1698c5c'
     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.2832@sha256:d56286bb800d6e5c5d1adb9c48a19ad8871d666b2bc2e368da52e3ad83d27738'
     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.2832@sha256:1e26fbbcdd88ae9364be5e07f727a964553e5e7343e607300e47efe54c40cccc'
     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.2832@sha256:77cc19d183c3faf973bc5195c4ecddf267d872aba8d1daf8490550b6408c2703'
     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.2832@sha256:a6376f662a8c113b6aa6dfec3cd663457b18db8c59b49f44dae69c69ff9a1bc3'
     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.2832@sha256:bf87ddf43a6578162adc5d324c3de02f676a2e59c6a305ffdec3cdd4e0d93645'
     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.2832@sha256:a6376f662a8c113b6aa6dfec3cd663457b18db8c59b49f44dae69c69ff9a1bc3'
     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.2832@sha256:bf87ddf43a6578162adc5d324c3de02f676a2e59c6a305ffdec3cdd4e0d93645'
     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.2832@sha256:f45d42f738604bb0101999d679e5e332e037ba7fb27576ec89b18f9bf6cdbfd3'
     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.2832@sha256:bf87ddf43a6578162adc5d324c3de02f676a2e59c6a305ffdec3cdd4e0d93645'
     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.2832@sha256:1b7c5abbacfb7d241064ba9ea57e95854ef9f0647393d3b864ba1ede6e486046'
     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.2832@sha256:5546468ae5312087f83adcca197fbb57df16c757be1b009e0e65ae8af1ef3822'
     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.2832@sha256:35425c200e667a158a9ac29eb9c2f1766f2ddc88030d8681de725924ffbbb76f'
     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.2832@sha256:e3ed8027100313d669c3ae160b38a364df1b0420bad4785e7657684f421301ef'
     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..75a1740f3 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.2832@sha256:e68a985b7385db8feb66134c239daaa73245f33970c93db160e320473522d9d5'
     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..f7e54af42 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.2832@sha256:f7f00be69c8c828149c8986cd3e197894ddebc8d0aa1772b7e764d968c194dc2'
     cpus: 0.5
     mem_limit: '512m'
     ports:

From 7d4408b7a9bb1e2b992d5b16f78533d564f225ad Mon Sep 17 00:00:00 2001
From: Warren Gifford <warrenbruceg@gmail.com>
Date: Fri, 13 Dec 2024 00:11:02 +0000
Subject: [PATCH 3/5] promote-release: v5.10.2832

{"version":"v5.10.2832","inputs":"server=5.10.2832","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 c169e3f9c..068eae688 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.2832@sha256:d1518bacdac8f3697d2388da904732dd1ea030b0e0292a0859011349041ea4ad'
+    image: 'index.docker.io/sourcegraph/postgres-12-alpine:5.10.2832@sha256:019bb4090f2bc20218887f5fd1bcfaa122ca090460f5803e1df4f6637947cb26'
     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.2832@sha256:d1518bacdac8f3697d2388da904732dd1ea030b0e0292a0859011349041ea4ad'
+    image: 'index.docker.io/sourcegraph/codeintel-db:5.10.2832@sha256:019bb4090f2bc20218887f5fd1bcfaa122ca090460f5803e1df4f6637947cb26'
     cpus: 4
     mem_limit: '2g'
     healthcheck:
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index fe2201d05..16b1169a5 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.2832@sha256:4b9b5913e30a246f98f537d7b9faeae25be2ff1119b7a8793135dc4d86278c2c'
+    image: 'index.docker.io/sourcegraph/migrator:5.10.2832@sha256:4f5e69016f947211ef7d14e88df091550a6472f5281b025f08d234d8acc0d993'
     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.2832@sha256:afaf94a4313d0f21016bfab8844e305fddd4a6ee6acb274f5bd8ee74b6ffb1a2'
+    image: 'index.docker.io/sourcegraph/caddy:5.10.2832@sha256:c32388e630abaf57bebf43fa0536b7bc1026360a0cb63908a89d7a3d227a00aa'
     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.2832@sha256:539c878b3dc4f1d7321b2fa324a4db396fd1182b3c0f3a06ac5b022d8b35feab'
+    image: 'index.docker.io/sourcegraph/frontend:5.10.2832@sha256:b918b672d858dc6e0c9e48f0669a59bc1a78aed9bfceec020788f689829ad415'
     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.2832@sha256:539c878b3dc4f1d7321b2fa324a4db396fd1182b3c0f3a06ac5b022d8b35feab'
+    image: 'index.docker.io/sourcegraph/frontend:5.10.2832@sha256:b918b672d858dc6e0c9e48f0669a59bc1a78aed9bfceec020788f689829ad415'
     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.2832@sha256:f535369dcc679afbed47c1890236a871cac6997489ebaa3f4002f97b34418bb3'
+    image: 'index.docker.io/sourcegraph/gitserver:5.10.2832@sha256:da3e193ab6b37ffa9374fb44d727ebfdbe62f88e117c902e488b348c59663ace'
     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.2832@sha256:6a5989bcfe42b5863e0018f44e5095f51697154e3fb241ad45003a1715e6b5b6'
+    image: 'index.docker.io/sourcegraph/search-indexer:5.10.2832@sha256:deedce4cb9a7c01105904c427d615a23e34301e52728af8f08c73fda4eecbee1'
     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.2832@sha256:1c112d3dd23d01c659b20e6dfbab671fe71117740f1b496d81c05bb184a77b25'
+    image: 'index.docker.io/sourcegraph/indexed-searcher:5.10.2832@sha256:876a5b31fd55dfcd827329b64e2ba5bcce7ed268e0964736b4527aa8b17a835b'
     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.2832@sha256:1955a760f7188e61e5a4dcb0fb11d4509ca7a3e4c4ff986bb92ce69489295dee'
+    image: 'index.docker.io/sourcegraph/searcher:5.10.2832@sha256:cd129b4232059e670d275a1c5b20b46c869b099631014c5980258f608f4b5053'
     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.2832@sha256:8e6d07fa523212409e2b9bb338ea9e6d9ad93989bf7038b8a1c084bf7e3cbb17'
+    image: 'index.docker.io/sourcegraph/precise-code-intel-worker:5.10.2832@sha256:62f10f3cd7aa7dd74053ac76057c914b90a8ced07c999e3d862b50544b11bc09'
     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.2832@sha256:38f19327ce92d754ffca346a7447bb7899c1143bf31c393b24973cdb9a0b8c4e'
+    image: 'index.docker.io/sourcegraph/repo-updater:5.10.2832@sha256:2fc71baa001a842760f219379343e7f89ed144ad8e2d9925ed3f988ba15b9b35'
     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.2832@sha256:4883593fbe63de5e195e44a96910d3f8d1993a54225d400af4c14f39afbcf357'
+    image: 'index.docker.io/sourcegraph/worker:5.10.2832@sha256:a4a9a4fb88855ce043536e0f694e29327cea881a8ca28a54a99d87d3bc63f783'
     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.2832@sha256:5a6161eb1993d918bb5aa2ecc75828ae65c7051c8054e62811f57777c1ae4351'
+    image: 'index.docker.io/sourcegraph/syntax-highlighter:5.10.2832@sha256:6043ae53bb68c84ef466902dce435e2e42f72a6ebb6fbc3c1902554ca946917f'
     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.2832@sha256:833b68a349b0cb18c03842753524afa1bf90a99ef21ca2b3619e5da3fc69e85e'
+    image: 'index.docker.io/sourcegraph/symbols:5.10.2832@sha256:83b4a9d2c6b14f16adaffcd87578efd132dadcf7307611661e3c6bc61f1c9640'
     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.2832@sha256:4d93e03f0c4311fd222469a9ed6c45a2dfcc1b1bb8faee3734c4d091b1698c5c'
+    image: 'index.docker.io/sourcegraph/prometheus:5.10.2832@sha256:18023ce87c412b62e3c8f56030247de55f0d545608edefdfc041c5a95d1c4951'
     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.2832@sha256:d56286bb800d6e5c5d1adb9c48a19ad8871d666b2bc2e368da52e3ad83d27738'
+    image: 'index.docker.io/sourcegraph/grafana:5.10.2832@sha256:5bbc2a2a9a32490a0ea7969a400ae17af1baa22a8216c45fa14168d560574f79'
     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.2832@sha256:1e26fbbcdd88ae9364be5e07f727a964553e5e7343e607300e47efe54c40cccc'
+    image: 'index.docker.io/sourcegraph/cadvisor:5.10.2832@sha256:22f81bf1d57b6f9d14c831639f6ec8057649c4d1525d0df46efb4872d5e95308'
     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.2832@sha256:77cc19d183c3faf973bc5195c4ecddf267d872aba8d1daf8490550b6408c2703'
+    image: 'index.docker.io/sourcegraph/node-exporter:5.10.2832@sha256:c31345f0ad1f9665b121d09df45ba9cfc87945b31a8ae7aaa528a2564e3002e4'
     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.2832@sha256:a6376f662a8c113b6aa6dfec3cd663457b18db8c59b49f44dae69c69ff9a1bc3'
+    image: 'index.docker.io/sourcegraph/postgresql-16:5.10.2832@sha256:7a637a98960cb7d3ac6705c7f7335874c005ed9f0c68bfaa0e5eebf2d7f71e94'
     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.2832@sha256:bf87ddf43a6578162adc5d324c3de02f676a2e59c6a305ffdec3cdd4e0d93645'
+    image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.2832@sha256:190eea7189d7831be9f04f13a47cfb19de9a1c1ac18739ac40d261f05c2b41aa'
     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.2832@sha256:a6376f662a8c113b6aa6dfec3cd663457b18db8c59b49f44dae69c69ff9a1bc3'
+    image: 'index.docker.io/sourcegraph/postgresql-16:5.10.2832@sha256:7a637a98960cb7d3ac6705c7f7335874c005ed9f0c68bfaa0e5eebf2d7f71e94'
     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.2832@sha256:bf87ddf43a6578162adc5d324c3de02f676a2e59c6a305ffdec3cdd4e0d93645'
+    image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.2832@sha256:190eea7189d7831be9f04f13a47cfb19de9a1c1ac18739ac40d261f05c2b41aa'
     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.2832@sha256:f45d42f738604bb0101999d679e5e332e037ba7fb27576ec89b18f9bf6cdbfd3'
+    image: 'index.docker.io/sourcegraph/postgresql-16-codeinsights:5.10.2832@sha256:96b88fb2fe8bbd735be8ee75e5b49c70d7dc11089ae5fa7307955728adba6a7d'
     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.2832@sha256:bf87ddf43a6578162adc5d324c3de02f676a2e59c6a305ffdec3cdd4e0d93645'
+    image: 'index.docker.io/sourcegraph/postgres_exporter:5.10.2832@sha256:190eea7189d7831be9f04f13a47cfb19de9a1c1ac18739ac40d261f05c2b41aa'
     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.2832@sha256:1b7c5abbacfb7d241064ba9ea57e95854ef9f0647393d3b864ba1ede6e486046'
+    image: 'index.docker.io/sourcegraph/blobstore:5.10.2832@sha256:f6b5ca96aa06a48e0c2c1f0387af74bb965029e27d4e0a58cdc38fbd4ac3c80e'
     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.2832@sha256:5546468ae5312087f83adcca197fbb57df16c757be1b009e0e65ae8af1ef3822'
+    image: 'index.docker.io/sourcegraph/redis-cache:5.10.2832@sha256:7c62920aa1cfbaf4f7ecb216786120a0f880de872669dea5afa0459af5bf36a5'
     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.2832@sha256:35425c200e667a158a9ac29eb9c2f1766f2ddc88030d8681de725924ffbbb76f'
+    image: 'index.docker.io/sourcegraph/redis-store:5.10.2832@sha256:413d44f4cc7ec3625f0dcaac2b2a8faa3c2455e78df7ba0e7485e2f0b09a2a41'
     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.2832@sha256:e3ed8027100313d669c3ae160b38a364df1b0420bad4785e7657684f421301ef'
+    image: 'index.docker.io/sourcegraph/opentelemetry-collector:5.10.2832@sha256:b1cc044ff1263220944c00bd056779fe789deb72aaf7d5f9f23bba1af66683dd'
     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 75a1740f3..7f62c4d9d 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.2832@sha256:e68a985b7385db8feb66134c239daaa73245f33970c93db160e320473522d9d5'
+    image: 'index.docker.io/sourcegraph/executor:5.10.2832@sha256:f47dfe9663f316cb224f401f6be3bbf96ae4f3bbd379fb4322f5ff5fca31b40b'
     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 f7e54af42..6f1ce5374 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.2832@sha256:f7f00be69c8c828149c8986cd3e197894ddebc8d0aa1772b7e764d968c194dc2'
+    image: 'index.docker.io/sourcegraph/jaeger-all-in-one:5.10.2832@sha256:1d316ea0996b31dc38bef8ccee74f1bd0383500931ea0f79defa69a9594c6144'
     cpus: 0.5
     mem_limit: '512m'
     ports:

From 9e745f4745c22f4bef64f090d9094999d510efd7 Mon Sep 17 00:00:00 2001
From: Warren Gifford <warrenbruceg@gmail.com>
Date: Fri, 13 Dec 2024 13:46:30 -0800
Subject: [PATCH 4/5] fix insiders tags

---
 pure-docker/deploy-codeinsights-db.sh | 2 +-
 pure-docker/deploy-codeintel-db.sh    | 2 +-
 pure-docker/deploy-pgsql.sh           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pure-docker/deploy-codeinsights-db.sh b/pure-docker/deploy-codeinsights-db.sh
index 22628d77c..a41698c5a 100755
--- a/pure-docker/deploy-codeinsights-db.sh
+++ b/pure-docker/deploy-codeinsights-db.sh
@@ -23,7 +23,7 @@ docker run --detach \
   -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
+  index.docker.io/sourcegraph/postgresql-16-codeinsights:5.10.2832@sha256:96b88fb2fe8bbd735be8ee75e5b49c70d7dc11089ae5fa7307955728adba6a7d
 
 # 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 c5a550cce..30683b909 100755
--- a/pure-docker/deploy-codeintel-db.sh
+++ b/pure-docker/deploy-codeintel-db.sh
@@ -19,7 +19,7 @@ docker run --detach \
   --memory=2g \
   -e PGDATA=/var/lib/postgresql/data/pgdata \
   -v $VOLUME:/var/lib/postgresql/data/ \
-  index.docker.io/sourcegraph/postgresql-16:insiders
+  index.docker.io/sourcegraph/postgresql-16:5.10.2832@sha256:7a637a98960cb7d3ac6705c7f7335874c005ed9f0c68bfaa0e5eebf2d7f71e94
 
 # 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 cf7f670ac..a045f4e26 100755
--- a/pure-docker/deploy-pgsql.sh
+++ b/pure-docker/deploy-pgsql.sh
@@ -19,7 +19,7 @@ docker run --detach \
   --memory=2g \
   -e PGDATA=/var/lib/postgresql/data/pgdata \
   -v $VOLUME:/var/lib/postgresql/data/ \
-  index.docker.io/sourcegraph/postgresql-16:insiders
+  index.docker.io/sourcegraph/postgresql-16:5.10.2832@sha256:7a637a98960cb7d3ac6705c7f7335874c005ed9f0c68bfaa0e5eebf2d7f71e94
 
 # Sourcegraph requires PostgreSQL 12+. Generally newer versions are better,
 # but anything 12 and higher is supported.

From e6bc97ac1adeafe02989d24306048d4e5e55bc5d Mon Sep 17 00:00:00 2001
From: Warren Gifford <warrenbruceg@gmail.com>
Date: Sun, 15 Dec 2024 13:11:22 -0800
Subject: [PATCH 5/5] correct codeintel in db-migrate dc yaml

---
 docker-compose/db-only-migrate.docker-compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml
index 068eae688..f87f4e4ce 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.10.2832@sha256:019bb4090f2bc20218887f5fd1bcfaa122ca090460f5803e1df4f6637947cb26'
+    image: 'index.docker.io/sourcegraph/postgresql-16:5.10.2832@sha256:7a637a98960cb7d3ac6705c7f7335874c005ed9f0c68bfaa0e5eebf2d7f71e94'
     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.10.2832@sha256:019bb4090f2bc20218887f5fd1bcfaa122ca090460f5803e1df4f6637947cb26'
+    image: 'index.docker.io/sourcegraph/postgresql-16:5.10.2832@sha256:7a637a98960cb7d3ac6705c7f7335874c005ed9f0c68bfaa0e5eebf2d7f71e94'
     cpus: 4
     mem_limit: '2g'
     healthcheck: