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.
chore: upgrade app to 2026.7.1, redis to 8.10-alpine
2026-08-10 20:34:10 +00:00 · 2026-08-03 22:24:21 +00:00 · 2026-07-13 17:59:04 +00:00 · 2026-06-19 02:21:36 +00:00
1 changed files with 2 additions and 2 deletions
@@ -3,7 +3,7 @@ version: "3.8"

 services:
  app:
-    image: discourse/discourse:3.5.3
+    image: discourse/discourse:2026.7.1
    networks:
      - proxy
      - internal
@@ -116,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:
Author	SHA1	Message	Date
autonomic-bot	f8dcc78013	chore: merge upstream main into the upgrade branch cc-ci/testme cc-ci: success Details continuous-integration/drone/pr Build was killed Details 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.	2026-08-10 20:34:10 +00:00
autonomic-bot	bfa21bc44e	chore: upgrade app to 2026.7.1, redis to 8.10-alpine cc-ci/testme cc-ci: success Details	2026-08-03 22:24:21 +00:00
autonomic-bot	0d7519e9ef	chore: upgrade app 3.5.3 -> 2026.1.5, redis 7.4-alpine -> 8.8-alpine cc-ci/testme cc-ci: failure Details	2026-07-13 17:59:04 +00:00
autonomic-bot	c10c04c520	chore: upgrade redis 7.4-alpine -> 8.8-alpine cc-ci/testme cc-ci: failure Details	2026-06-19 02:21:36 +00:00