From 4b0adde97d2f4f3d101c3564da5f0d6c984790a5 Mon Sep 17 00:00:00 2001 From: david-sandy Date: Wed, 2 Mar 2022 01:46:40 -0600 Subject: [PATCH 1/4] Update postgres references Update postgres-12.x references to simply 12. No tags exist for this image other than a very old one. --- docker-compose/db-only-migrate.docker-compose.yaml | 2 +- docker-compose/docker-compose.yaml | 2 +- pure-docker/deploy-pgsql.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml index 1c70526f2..19cec7fa7 100644 --- a/docker-compose/db-only-migrate.docker-compose.yaml +++ b/docker-compose/db-only-migrate.docker-compose.yaml @@ -12,7 +12,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgres-12.6-alpine:insiders@sha256:5a6badacb3cf2a2bfc039f68746e0d849e95ded1976bf3ef18471008069c5a97' + image: 'index.docker.io/sourcegraph/postgres-12-alpine:latest' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index de6e6884b..37af5e81b 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -534,7 +534,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgres-12.6-alpine:insiders@sha256:83b7a1d85e2c0a9df0fd0cfecef1a184e648ee7f274d9d26cbd8a86171c66b6a' + image: 'index.docker.io/sourcegraph/postgres-12-alpine:latest' cpus: 4 mem_limit: '2g' healthcheck: diff --git a/pure-docker/deploy-pgsql.sh b/pure-docker/deploy-pgsql.sh index 440154b81..95ae0a59f 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/postgres-12.6-alpine:3.36.3@sha256:8a07418646c33d74e749391da3470f37d5401edae588bb79655f8c7206257d49 + index.docker.io/sourcegraph/postgres-12-alpine:latest # Sourcegraph requires PostgreSQL 12+. Generally newer versions are better, # but anything 12 and higher is supported. From 2cfbe9bc82e10714eb5e1fd836829642f24b9676 Mon Sep 17 00:00:00 2001 From: david-sandy <92327545+david-sandy@users.noreply.github.com> Date: Thu, 3 Mar 2022 20:44:16 -0600 Subject: [PATCH 2/4] Pinned postgres image version with SHA --- docker-compose/db-only-migrate.docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/db-only-migrate.docker-compose.yaml b/docker-compose/db-only-migrate.docker-compose.yaml index 19cec7fa7..14733525f 100644 --- a/docker-compose/db-only-migrate.docker-compose.yaml +++ b/docker-compose/db-only-migrate.docker-compose.yaml @@ -12,7 +12,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgres-12-alpine:latest' + image: 'index.docker.io/sourcegraph/postgres-12-alpine:135107_2022-03-03_9498a8bd3366@sha256:e26b159dc7c0c47d136886390c899816e669a3c2c1ead689bdad0b610364e45e' cpus: 4 mem_limit: '2g' healthcheck: From e92f82ad1c7550ee89ea15140a3bff2ccecbe793 Mon Sep 17 00:00:00 2001 From: david-sandy <92327545+david-sandy@users.noreply.github.com> Date: Thu, 3 Mar 2022 20:45:27 -0600 Subject: [PATCH 3/4] Pinned postgres image --- docker-compose/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml index 37af5e81b..91956c9b4 100644 --- a/docker-compose/docker-compose.yaml +++ b/docker-compose/docker-compose.yaml @@ -534,7 +534,7 @@ services: # pgsql: container_name: pgsql - image: 'index.docker.io/sourcegraph/postgres-12-alpine:latest' + image: 'index.docker.io/sourcegraph/postgres-12-alpine:135107_2022-03-03_9498a8bd3366@sha256:e26b159dc7c0c47d136886390c899816e669a3c2c1ead689bdad0b610364e45e' cpus: 4 mem_limit: '2g' healthcheck: From e13309bddd8df753cafa471befbeb733dddd0ab0 Mon Sep 17 00:00:00 2001 From: david-sandy <92327545+david-sandy@users.noreply.github.com> Date: Thu, 3 Mar 2022 20:46:02 -0600 Subject: [PATCH 4/4] Pinned postgres image version --- pure-docker/deploy-pgsql.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pure-docker/deploy-pgsql.sh b/pure-docker/deploy-pgsql.sh index 95ae0a59f..4460ac1f6 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/postgres-12-alpine:latest + index.docker.io/sourcegraph/postgres-12-alpine:135107_2022-03-03_9498a8bd3366@sha256:e26b159dc7c0c47d136886390c899816e669a3c2c1ead689bdad0b610364e45e # Sourcegraph requires PostgreSQL 12+. Generally newer versions are better, # but anything 12 and higher is supported.