chore: merge upstream main into the upgrade branch

The branch predated the official-image migration (coop-cloud/discourse#16), so its
merge-base was 0.8.1+3.5.0 and the PR's file list re-showed that migration's changes
as if this PR introduced them. The branch TREE already matched upstream; only its
history lacked those commits. Recording the merge leaves the PR's diff as what it
actually changes: app 3.5.3 -> 2026.7.1 and redis 7.4-alpine -> 8.10-alpine.

Conflict in compose.yml resolved in favour of the branch (both sides edited the same
image lines; the branch already carries upstream's official-image switch plus the
version bumps). Resulting tree is byte-identical to the pre-merge branch tree.

abra.sh

@@ -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

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: discourse/discourse:3.5.3
+    image: discourse/discourse:2026.7.1
     networks:
       - proxy
       - internal
@@ -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:
@@ -119,7 +116,7 @@ services:
         backupbot.restore.post-hook: "/pg_backup.sh restore"
 
   redis:
-    image: redis:7.4-alpine
+    image: redis:8.10-alpine
     networks:
       - internal
     volumes:

pg_backup.sh

@@ -4,25 +4,13 @@
 
 set -e
 
-# discourse/postgres keeps the live cluster at a versioned PGDATA under the
+# dump goes at the volume root so backupbot's backup.sql label finds it
-# /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
+# bootstrap superuser for the dump/drop/recreate; same POSTGRES_USER the db service sets
-# (`postgres` on bitnami-origin clusters, `discourse` on others). Detect it at
+SU="${POSTGRES_USER:-postgres}"
-# 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"

release/1.0.0+3.5.3

@@ -1,10 +0,0 @@
-This release switches from the bitnami image to the official discourse/discourse
-image. Some env vars need to be renamed for this migration; everything else
-should happen automatically.
-
-Rename these in your app's .env (the values carry over):
-
-  DISCOURSE_SMTP_HOST     --> DISCOURSE_SMTP_ADDRESS
-  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)

release/next

@@ -0,0 +1,31 @@
+This release switches from the bitnami image to the official discourse/discourse
+image. Some env vars need to be renamed for this migration; everything else
+should happen automatically.
+
+** WARNING A: renaming env vars
+
+Rename these in your app's .env (the values carry over):
+
+  DISCOURSE_SMTP_HOST     --> DISCOURSE_SMTP_ADDRESS
+  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 B: undeploy before deploy 
+
+it is necessary to `abra app undeploy` your old discourse app before deploying this version. otherwise the database will get killed and be in a bad state before the migration. 
+this was a non-fatal error in testing, but still a huge pain. 
+
+`abra app undeploy YOURDOMAIN` # cleaning stops your discourse
+`abra app deploy YOURDOMAIN` # with the new version 
+
+** WARNING C: install user
+
+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'