Compare commits

...
Author SHA1 Message Date
notplants 77f4a7350b chore: publish 1.1.0+2026.7.1 release
continuous-integration/drone/tag Build was killed
2026-08-10 16:38:18 -04:00
notplants fdf62b4257 Merge pull request 'Upgrade to discourse:2026.7.1' (#17) from upgrade-c10c04c into main
Reviewed-on: https://git.coopcloud.tech/coop-cloud/discourse/pulls/17
2026-08-10 20:37:21 +00:00
autonomic-bot f8dcc78013 chore: merge upstream main into the upgrade branch
cc-ci/testme cc-ci: success
continuous-integration/drone/pr Build was killed
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
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
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
2026-06-19 02:21:36 +00:00
2 changed files with 3 additions and 3 deletions
+3 -3
View File
@@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: discourse/discourse:3.5.3
image: discourse/discourse:2026.7.1
networks:
- proxy
- internal
@@ -54,7 +54,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "coop-cloud.${STACK_NAME}.version=1.0.0+3.5.3"
- "coop-cloud.${STACK_NAME}.version=1.1.0+2026.7.1"
healthcheck:
test: "curl -fsS http://localhost/srv/status || exit 1"
interval: 30s
@@ -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: