f783d9988b
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.
60 lines
2.0 KiB
Bash
Executable File
60 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
# Postgres backup/restore hook for the discourse `db` service (discourse/postgres image).
|
|
|
|
set -e
|
|
|
|
# discourse/postgres keeps the live cluster at a versioned PGDATA under the
|
|
# /var/lib/postgresql mount. Write the dump at the volume root so backupbot's
|
|
# `postgresql_data.path: backup.sql` label captures it.
|
|
BACKUP_FILE='/var/lib/postgresql/backup.sql'
|
|
DATADIR="${PGDATA:-/var/lib/postgresql/18/docker}"
|
|
DB_NAME="${POSTGRES_DB:-discourse}"
|
|
|
|
# The bootstrap superuser (install user, oid 10) differs between deployments
|
|
# (`postgres` on bitnami-origin clusters, `discourse` on others). Detect it at
|
|
# runtime over the local trust socket rather than hard-coding a name.
|
|
detect_superuser() {
|
|
local u name
|
|
for u in discourse postgres; do
|
|
name="$(psql -U "$u" -d "$DB_NAME" -tAc 'select rolname from pg_roles where oid = 10' 2>/dev/null | tr -d '[:space:]')"
|
|
if [ -n "$name" ]; then echo "$name"; return 0; fi
|
|
done
|
|
echo postgres
|
|
}
|
|
SU="$(detect_superuser)"
|
|
|
|
function backup {
|
|
pg_dump -U "$SU" "$DB_NAME" | gzip > "$BACKUP_FILE"
|
|
}
|
|
|
|
function restore {
|
|
cd "$DATADIR"
|
|
|
|
# Block all non-local connections so the running discourse app + sidekiq cannot reconnect and
|
|
# interfere with the drop/recreate/reimport. Restored on exit.
|
|
restore_hba() {
|
|
cat pg_hba.conf.bak > pg_hba.conf
|
|
rm -f pg_hba.conf.bak
|
|
su postgres -c "pg_ctl -D '$DATADIR' reload"
|
|
}
|
|
cp pg_hba.conf pg_hba.conf.bak
|
|
echo 'local all all trust' > pg_hba.conf
|
|
su postgres -c "pg_ctl -D '$DATADIR' reload"
|
|
trap restore_hba EXIT INT TERM
|
|
|
|
# terminate any lingering local sessions before recreate
|
|
# see https://stackoverflow.com/questions/5108876/kill-a-postgresql-session-connection
|
|
psql -U "$SU" -d postgres -c \
|
|
"SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='${DB_NAME}' AND pid<>pg_backend_pid();"
|
|
|
|
# drop database and then recreate it
|
|
psql -U "$SU" -d postgres -c "DROP DATABASE ${DB_NAME} WITH (FORCE);"
|
|
createdb -U "$SU" "$DB_NAME"
|
|
|
|
# reimport data
|
|
gunzip -c "$BACKUP_FILE" | psql -U "$SU" -d "$DB_NAME" -1 -v ON_ERROR_STOP=1 -f -
|
|
}
|
|
|
|
$@
|