Compare commits

...

4 Commits

Author SHA1 Message Date
ede639916c docs: clarify install-user check (postgres = no env needed) 2026-06-22 19:31:27 +00:00
5f50022bb4 docs: drop healthcheck comment; rephrase release note POSTGRES_USER warning + check command 2026-06-22 19:24:49 +00:00
a5a3b36755 feat(db): use POSTGRES_USER in pg_backup; document it in release note
- pg_backup.sh: use the db service's POSTGRES_USER (default postgres) for the
  dump/drop/recreate instead of detecting the superuser at runtime, since the
  recipe now sets that env var; one-line the constants comment
- release note: explain the in-place pg_upgrade + the POSTGRES_USER override
- bump PG_BACKUP_VERSION v4

Verified on cctest: backup + restore via the hooks round-trips with POSTGRES_USER.
2026-06-22 18:46:17 +00:00
a081d1dba0 Update pg_backup.sh 2026-06-22 18:37:15 +00:00
4 changed files with 13 additions and 19 deletions

View File

@ -1,4 +1,4 @@
export PG_BACKUP_VERSION=v3
export PG_BACKUP_VERSION=v4
export APP_ENTRYPOINT_VERSION=v2
export APP_INSTALL_SSL_VERSION=v1
export APP_MIGRATE_UPLOADS_VERSION=v1

View File

@ -107,9 +107,6 @@ services:
interval: 30s
timeout: 10s
retries: 5
# generous: on a major-version bump the image installs the old binaries and
# runs pg_upgrade on first boot before the server accepts connections —
# don't let the healthcheck kill an in-progress migration
start_period: 15m
deploy:
labels:

View File

@ -4,25 +4,13 @@
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.
# dump goes at the volume root so backupbot's backup.sql label finds 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)"
# bootstrap superuser for the dump/drop/recreate; same POSTGRES_USER the db service sets
SU="${POSTGRES_USER:-postgres}"
function backup {
pg_dump -U "$SU" "$DB_NAME" | gzip > "$BACKUP_FILE"

View File

@ -8,3 +8,12 @@ Rename these in your app's .env (the values carry over):
DISCOURSE_SMTP_USER --> DISCOURSE_SMTP_USER_NAME
DISCOURSE_SMTP_AUTH --> DISCOURSE_SMTP_AUTHENTICATION
DISCOURSE_SMTP_PROTOCOL --> DISCOURSE_SMTP_ENABLE_START_TLS (takes a boolean true/false, not the old tls/ssl value, so translate it rather than copying it straight across)
WARNING: if your deployment's database has an "install user" other than `postgres`
(some older deployments do), you must set the POSTGRES_USER env var in your .env
for this migration, otherwise the postgres upgrade aborts with an install-user
mismatch.
Check your old deployment's install user before upgrading (if this command returns postgres, then you do not need to set this env):
abra app run YOURAPPDOMAIN db -- psql -U discourse -tAc 'select rolname from pg_roles where oid = 10'