Compare commits

..

1 Commits

Author SHA1 Message Date
f783d9988b feat(db): switch to discourse/postgres image (auto-upgrade, no custom entrypoint file)
Replace the bitnami-era pgvector:pg17 db + hand-rolled pg_upgrade entrypoint
with discourse/postgres:pg18 (pgvector + discourse's auto-upgrade layer, as
suggested on coop-cloud/discourse#16). The image runs the in-place major-version
pg_upgrade itself on boot, so the recipe just configures it via env:

- the db password secret is read into $DB_PASSWORD by a small inline entrypoint
  (the image expects it in the env, no *_FILE support; the base image's
  POSTGRES_PASSWORD_FILE can't be used because run-postgres.sh pre-generates
  POSTGRES_PASSWORD). No separate entrypoint file/config any more.
- POSTGRES_USER (the install user pg_upgrade must match) defaults to the image's
  'postgres' -- correct for fresh installs and bitnami-origin clusters -- and is
  overridable from the app .env for a cluster bootstrapped with another superuser.
- POSTGRES_INITDB_ARGS=--no-data-checksums so the new pg18 cluster matches the
  pre-18 clusters (pg18 initdb enables checksums by default; pg_upgrade needs a
  match).

- mount postgresql_data at /var/lib/postgresql (versioned PGDATA .../18/docker)
- pg_backup.sh: detect the superuser at runtime; fix paths for the new layout
- document POSTGRES_USER override in .env.sample and README
- bump PG_BACKUP_VERSION v3; drop DB_ENTRYPOINT_VERSION + entrypoint.postgres.sh.tmpl

Verified on cctest: pg17->pg18 upgrade (install user 'postgres', checksums off)
preserves data and serves over HTTPS; fresh install also works.
2026-06-22 18:23:22 +00:00
3 changed files with 10 additions and 30 deletions

View File

@ -1,4 +1,3 @@
export DB_ENTRYPOINT_VERSION=v7
export PG_BACKUP_VERSION=v3
export APP_ENTRYPOINT_VERSION=v2
export APP_INSTALL_SSL_VERSION=v1

View File

@ -1,20 +0,0 @@
#!/bin/bash
# Co-op Cloud entrypoint wrapper for the discourse/postgres image.
#
# The image (https://github.com/discourse/discourse-postgres) handles everything
# itself, including the in-place major-version pg_upgrade on boot. The only thing
# it can't do for us is read the docker secret: it expects the DB password in the
# DB_PASSWORD / POSTGRES_PASSWORD env vars (no *_FILE support), so inject it from
# /run/secrets here, then hand off to the image's real entrypoint.
#
# The install user and data-checksum settings the upgrade needs are passed as
# plain env vars in compose.yml (POSTGRES_USER, POSTGRES_INITDB_ARGS).
set -e
if [ -f /run/secrets/db_password ]; then
DB_PASSWORD="$(cat /run/secrets/db_password)"
export DB_PASSWORD
export POSTGRES_PASSWORD="$DB_PASSWORD"
fi
exec run-postgres.sh postgres

View File

@ -65,8 +65,7 @@ services:
db:
# discourse/postgres = pgvector + discourse's postgres management layer, which
# auto-upgrades an older cluster in place on boot (pg_upgrade into the versioned
# PGDATA /var/lib/postgresql/${MAJOR}/docker). The cc-db-entrypoint wrapper only
# injects the password secret; everything else is driven by the env below.
# PGDATA /var/lib/postgresql/${MAJOR}/docker); everything is driven by the env below.
image: discourse/postgres:pg18
networks:
- internal
@ -77,13 +76,18 @@ services:
# an existing pg17 cluster at the volume root is found and upgraded into /18/docker
- 'postgresql_data:/var/lib/postgresql'
configs:
- source: db_entrypoint
target: /usr/local/bin/cc-db-entrypoint.sh
mode: 0555
- source: pg_backup
target: /pg_backup.sh
mode: 0555
entrypoint: /usr/local/bin/cc-db-entrypoint.sh
entrypoint:
- /bin/bash
- -c
- |
if [ -f /run/secrets/db_password ]; then
DB_PASSWORD="$$(cat /run/secrets/db_password)"
export DB_PASSWORD POSTGRES_PASSWORD="$$DB_PASSWORD"
fi
exec run-postgres.sh postgres
environment:
# internal-only overlay network; keep all-trust so the app and the
# backup/restore hooks connect without juggling the superuser password
@ -153,9 +157,6 @@ configs:
app_migrate_uploads:
name: ${STACK_NAME}_app_migrate_uploads_${APP_MIGRATE_UPLOADS_VERSION}
file: migrate-uploads.sh
db_entrypoint:
name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
file: cc-db-entrypoint.sh
pg_backup:
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
file: pg_backup.sh