fix: drop orphaned image-less sidekiq from compose.smtpauth.yml

The official-image migration removed the separate sidekiq service from
compose.yml (sidekiq now runs inside the official discourse app image). The
compose.smtpauth.yml overlay still declared a sidekiq: block (smtp env +
smtp_password secret, no image), leaving a dangling image-less service in the
smtpauth-merged compose -> abra recipe lint R011 fail (invalid reference
format) and a broken SMTP-auth deploy. The app: override already carries the
DISCOURSE_SMTP_PASSWORD_FILE env + smtp_password secret (and compose.yml app
has all DISCOURSE_SMTP_* vars), so the sidekiq override is redundant. Drop it.

.env.sample

@@ -5,17 +5,19 @@ DOMAIN=discourse.example.com
 #EXTRA_DOMAINS=', `www.discourse.example.com`'
 LETS_ENCRYPT_ENV=production
 
-# Outgoing email
+# Admin / developer accounts (comma-separated); these become admins on signup
-#DISCOURSE_SMTP_HOST=
+DISCOURSE_DEVELOPER_EMAILS=admin@example.com
-#DISCOURSE_SMTP_PORT=
-#DISCOURSE_SMTP_USER=
-#DISCOURSE_SMTP_PROTOCOL=
-#DISCOURSE_SMTP_AUTH=
-# Set this if you send e-mails from a different domain than noreply@$DOMAIN
-#DISCOURSE_NOTIFICATION_EMAIL=$SMTP_USER
 
-# SMTP authentication
+# Outgoing email (official discourse/discourse env names)
-#COMPOSE_FILE="compose.yml:compose.smtpauth.yml"
+#DISCOURSE_SMTP_ADDRESS=
+#DISCOURSE_SMTP_PORT=587
+#DISCOURSE_SMTP_USER_NAME=
+#DISCOURSE_SMTP_AUTHENTICATION=login
+#DISCOURSE_SMTP_ENABLE_START_TLS=true
+# Set this if you send e-mail from a different address than noreply@$DOMAIN
+#DISCOURSE_NOTIFICATION_EMAIL=
+
+# SMTP password as a secret
 #SECRET_SMTP_PASSWORD_VERSION=v1
 
 SECRET_DB_PASSWORD_VERSION=v1

README.md

@@ -6,67 +6,60 @@ A platform for community discussion
 
 <!-- metadata -->
 * **Category**: Apps
-* **Status**: 
+* **Status**: 3, experimental
-* **Image**: [`bitnami/discourse`](https://hub.docker.com/r/bitnami/discourse)
+* **Image**: [`discourse/discourse`](https://hub.docker.com/r/discourse/discourse), 4, upstream
 * **Healthcheck**: yes
-* **Backups**: no
+* **Backups**: yes
 * **Email**: yes
-* **Tests**: no
+* **Tests**: yes
 * **SSO**: no
 <!-- endmetadata -->
 
+> **Note**: this recipe runs the official, **experimental** `discourse/discourse`
+> image. Upstream does not yet recommend it for production — see
+> <https://meta.discourse.org/t/380646>. Use with care.
+
 ## Basic usage
 
 1. Set up Docker Swarm and [`abra`]
 2. Deploy [`coop-cloud/traefik`]
-3. `abra app new discourse --secrets` (optionally with `--pass` if you'd like
+3. `abra app new discourse --secrets` (optionally with `--pass` to save secrets in `pass`)
-   to save secrets in `pass`)
+4. `abra app config YOURAPPDOMAIN` — set `DOMAIN` and `DISCOURSE_DEVELOPER_EMAILS`
-4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
-   your Docker swarm box
 5. `abra app deploy YOURAPPDOMAIN`
-6. Open the configured domain in your browser to finish set-up
+6. Open the configured domain in your browser to finish set-up. The first account
+   that registers with an address listed in `DISCOURSE_DEVELOPER_EMAILS` becomes
+   an admin.
 
-[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
+[`abra`]: https://docs.coopcloud.tech/abra/
-[`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik
+[`coop-cloud/traefik`]: https://git.coopcloud.tech/coop-cloud/traefik
 
-## To add a new admin user
+The app serves plain HTTP on port 80; Traefik terminates TLS in front of it. The
+image's built-in nginx/Let's Encrypt is disabled by the recipe (`install-ssl`
+override) so it works behind the reverse proxy.
 
-1. Login to the instance `abra app run APPNAME app sh`
+## Add an admin user
-2. `cd /opt/bitnami/discourse`
-3. `RAILS_ENV=production bundle exec rake admin:create` and follow prompts.
 
-## Install plugins
+```
-
+abra app run YOURAPPDOMAIN app discourse admin create
-1. Login to instance `abra app run APPNAME app sh`
+```
-2. `cd /bitnami/discourse/plugins/`
-3. `git clone plugin.git` for example `https://github.com/discourse/discourse-openid-connect.git`
-4. `abra app restart YOURAPPDOMAIN app`
-
-### Events / calendar plugin
-
-We've had some luck running [discourse-events](https://github.com/paviliondev/discourse-events).
-
-## Setup Notes
-
-Until issue #1 is fixed, the default user is `user` and the default password is `bitnami123`
 
 ## Postgres major version upgrades
 
-Welcome to hell.
+Handled automatically. The `db` entrypoint detects an older data directory on
+deploy and runs `pg_upgrade` in place (it installs the old binaries, detects the
+cluster's real install superuser, and upgrades). No manual dump/restore needed.
 
-1. `abra app run YOURAPPDOMAIN db pg_dumpall -U discourse | gzip > YOURAPPDOMAIN_db_DATE.sql.gz`
+## Migrating from the previous (bitnami) recipe
-2. `abra app volume ls YOURAPPDOMAIN`, find the name of the Postgres data volume
+
-3. `scp` the backup to your VPS
+The official image stores uploads under `/shared` rather than bitnami's
-4. `abra app undeploy YOURAPPDOMAIN`
+`/bitnami/discourse`. On first boot the recipe copies uploads + backups from the
-5. `abra app volume rm YOURAPPDOMAIN`, choose the Postgres data volume
+old bitnami volume (mounted read-only at `/legacy`) into `/shared`, once,
-6. `abra app deploy YOURAPPDOMAIN`, then `abra app undeploy YOURAPPDOMAIN`
+idempotently. The Postgres database is reused as-is. After a successful migration
-7. `ssh` to the VPS, run (replacing `13-alpine` with the new Postgres version)
+a later recipe version will drop the transitional `/legacy` mount.
-   `docker run -v YOURDATAVOLUME:/var/lib/postgresql/data -e POSTGRES_HOST_AUTH_METHOD=trust -it postgres:13-alpine`
+
-8. In another SSH session on the server, run `docker ps` to find the ID of the
+If you are upgrading from the bitnami recipe, also remove the now-unused sidekiq
-   new Postgres container, then `docker exec -it CONTAINERID bash`
+service that swarm leaves behind (sidekiq runs inside the app container now):
-9. In the shell you just launched, run `dropdb -U discourse discourse`, then
+
-   `createdb -U discourse discourse`, then Ctrl+D or run `exit`
+```
-10. In the second SSH session, run `zcat YOURAPPDOMAIN_db_DATE.sql.gz | docker exec -it CONTAINERID psql -U discourse`
+docker service rm YOURSTACK_sidekiq
-11. Exit the second SSH session
+```
-12. Back in the first SSH session, Ctrl+C to shut down the database
-13. `abra app deploy YOURAPPDOMAIN`

abra.sh

@@ -1,2 +1,5 @@
 export DB_ENTRYPOINT_VERSION=v3
 export PG_BACKUP_VERSION=v2
+export APP_ENTRYPOINT_VERSION=v1
+export APP_INSTALL_SSL_VERSION=v1
+export APP_MIGRATE_UPLOADS_VERSION=v1

app-install-ssl.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Overrides the official image's /etc/runit/1.d/install-ssl.
+#
+# The stock install-ssl always runs configure-ssl (and configure-letsencrypt),
+# which empties the default `listen 80` nginx outlet and switches to `listen 443
+# ssl` against a cert that does not exist here — nginx then crash-loops, or the
+# image tries to obtain its own Let's Encrypt cert. Under Co-op Cloud, Traefik
+# terminates TLS and proxies plain HTTP to port 80, so we skip the image's SSL
+# setup entirely and let nginx keep its default HTTP-on-80 config.
+echo "install-ssl overridden by recipe: serving plain HTTP on :80 behind Traefik"
+exit 0

cc-app-entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Co-op Cloud wrapper around the official image's /sbin/boot.
+# discourse/discourse reads DISCOURSE_DB_PASSWORD from the process env (pups/Ruby;
+# it has no *_FILE support), so inject it from the docker secret before booting.
+set -e
+
+if [ -f /run/secrets/db_password ]; then
+  export DISCOURSE_DB_PASSWORD="$(cat /run/secrets/db_password)"
+fi
+
+exec /sbin/boot

compose.smtpauth.yml

@@ -8,12 +8,6 @@ services:
     secrets:
       - smtp_password
 
-  sidekiq:
-    environment:
-      - DISCOURSE_SMTP_PASSWORD_FILE=/var/run/secrets/smtp_password
-    secrets:
-      - smtp_password
-
 secrets:
   smtp_password:
     external: true

compose.yml

@@ -3,53 +3,64 @@ version: "3.8"
 
 services:
   app:
-    image: bitnamilegacy/discourse:3.5.0
+    image: discourse/discourse:3.5.3
     networks:
       - proxy
       - internal
-    # entrypoint: ['tail', '-f', '/dev/null']
+    # official image CMD is /sbin/boot; wrapper injects the DB password secret first
+    entrypoint: /usr/local/bin/cc-app-entrypoint.sh
     environment:
-      - ALLOW_EMPTY_PASSWORD=yes
+      - DISCOURSE_HOSTNAME=${DOMAIN}
-      - DISCOURSE_DATABASE_HOST=${STACK_NAME}_db
+      - DISCOURSE_DEVELOPER_EMAILS=${DISCOURSE_DEVELOPER_EMAILS}
-      - DISCOURSE_DATABASE_NAME=discourse
+      - DISCOURSE_DB_HOST=${STACK_NAME}_db
-      - DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
+      - DISCOURSE_DB_PORT=5432
-      - DISCOURSE_DATABASE_USER=discourse
+      - DISCOURSE_DB_NAME=discourse
-      - DISCOURSE_HOST=${DOMAIN}
+      - DISCOURSE_DB_USERNAME=discourse
-      - DISCOURSE_NOTIFICATION_EMAIL
+      - DISCOURSE_REDIS_HOST=${STACK_NAME}_redis
-      - DISCOURSE_SMTP_AUTH
+      - DISCOURSE_REDIS_PORT=6379
-      - DISCOURSE_SMTP_HOST
+      - DISCOURSE_SMTP_ADDRESS
       - DISCOURSE_SMTP_PORT
-      - DISCOURSE_SMTP_PROTOCOL
+      - DISCOURSE_SMTP_USER_NAME
-      - DISCOURSE_SMTP_USER
+      - DISCOURSE_SMTP_PASSWORD
-      - PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0
+      - DISCOURSE_SMTP_AUTHENTICATION
+      - DISCOURSE_SMTP_ENABLE_START_TLS
+      - DISCOURSE_NOTIFICATION_EMAIL
     volumes:
-      - 'discourse_data:/bitnami/discourse'
+      - 'discourse_shared:/shared'
+      # transition only: legacy bitnami volume, read-only, for one-time upload migration
+      - 'discourse_data:/legacy:ro'
     secrets:
       - db_password
+    configs:
+      - source: app_entrypoint
+        target: /usr/local/bin/cc-app-entrypoint.sh
+        mode: 0555
+      - source: app_install_ssl
+        target: /etc/runit/1.d/install-ssl
+        mode: 0555
+      - source: app_migrate_uploads
+        target: /etc/runit/1.d/02-migrate-bitnami-uploads
+        mode: 0555
     depends_on:
       - db
       - redis
     deploy:
       update_config:
         failure_action: rollback
-        order: start-first
+        order: stop-first
       labels:
         - "traefik.enable=true"
-        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3000"
+        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
         - "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}"
-        ## Redirect from EXTRA_DOMAINS to DOMAIN
+        - "coop-cloud.${STACK_NAME}.version=1.0.0+3.5.3"
-        #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
-        - "coop-cloud.${STACK_NAME}.version=0.8.1+3.5.0"
     healthcheck:
-      test: "ruby -e \"require 'uri'; require 'net/http'; uri = URI('http://localhost:3000/srv/status'); res = Net::HTTP.get_response(uri); if res.is_a?(Net::HTTPSuccess) then exit (0) else exit (1) end\""
+      test: "curl -fsS http://localhost/srv/status || exit 1"
       interval: 30s
       timeout: 10s
       retries: 6
-      start_period: 20m
+      start_period: 25m
 
   db:
     image: pgvector/pgvector:pg17
@@ -72,6 +83,15 @@ services:
       - POSTGRES_USER=discourse
       - POSTGRES_DB=discourse
       - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
+    healthcheck:
+      test: "pg_isready -U discourse -d discourse"
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      # generous: a postgres major-version upgrade (apt install + pg_upgrade) runs
+      # in the entrypoint before the server accepts connections — don't let the
+      # healthcheck kill an in-progress migration
+      start_period: 10m
     deploy:
       labels:
         backupbot.backup: "true"
@@ -85,35 +105,12 @@ services:
       - internal
     volumes:
       - 'redis_data:/data'
-
+    healthcheck:
-  sidekiq:
+      test: "redis-cli ping | grep -q PONG"
-    image: bitnamilegacy/discourse:3.5.0
+      interval: 30s
-    networks:
+      timeout: 5s
-      - proxy
+      retries: 5
-      - internal
+      start_period: 30s
-    depends_on:
-      - discourse
-    volumes:
-      - 'discourse_data:/bitnami/discourse'
-    command: /opt/bitnami/scripts/discourse-sidekiq/run.sh
-    secrets:
-      - db_password
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - DISCOURSE_DATABASE_HOST=db
-      - DISCOURSE_DATABASE_NAME=discourse
-      - DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
-      - DISCOURSE_DATABASE_PORT_NUMBER=5432
-      - DISCOURSE_DATABASE_USER=discourse
-      - DISCOURSE_HOST=${DOMAIN}
-      - DISCOURSE_REDIS_HOST=redis
-      - DISCOURSE_REDIS_PORT_NUMBER=6379
-      - DISCOURSE_SMTP_HOST
-      - DISCOURSE_SMTP_PORT
-      - DISCOURSE_SMTP_PROTOCOL
-      - DISCOURSE_SMTP_USER
-      - PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0
-      - DISCOURSE_SMTP_AUTH
 
 secrets:
   db_password:
@@ -123,6 +120,7 @@ secrets:
 volumes:
   postgresql_data:
   redis_data:
+  discourse_shared:
   discourse_data:
 
 networks:
@@ -131,6 +129,15 @@ networks:
   internal:
 
 configs:
+  app_entrypoint:
+    name: ${STACK_NAME}_app_entrypoint_${APP_ENTRYPOINT_VERSION}
+    file: cc-app-entrypoint.sh
+  app_install_ssl:
+    name: ${STACK_NAME}_app_install_ssl_${APP_INSTALL_SSL_VERSION}
+    file: app-install-ssl.sh
+  app_migrate_uploads:
+    name: ${STACK_NAME}_app_migrate_uploads_${APP_MIGRATE_UPLOADS_VERSION}
+    file: migrate-uploads.sh
   db_entrypoint:
     name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
     file: entrypoint.postgres.sh.tmpl

migrate-uploads.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+# One-time, idempotent, NON-destructive migration of uploads + backups from a
+# legacy bitnami discourse volume into the official image's /shared.
+#
+# Runs on every boot as a runit 1.d hook but no-ops after the first success
+# (sentinel) and when there is no legacy volume mounted (fresh installs). It only
+# ever COPIES from the read-only /legacy mount, so an interruption just re-copies
+# on the next boot — there is no move/delete to leave the data half-migrated.
+set -e
+
+SENTINEL=/shared/.bitnami-uploads-migrated
+[ -e "$SENTINEL" ] && exit 0
+
+if [ -d /legacy/public/uploads ]; then
+  echo "[migrate-uploads] copying bitnami uploads/backups -> /shared"
+  mkdir -p /shared/uploads /shared/backups
+  cp -a /legacy/public/uploads/. /shared/uploads/ 2>/dev/null || true
+  cp -a /legacy/public/backups/. /shared/backups/ 2>/dev/null || true
+  # discourse runs as uid 1000; the official boot also chowns /shared, but be explicit
+  chown -R discourse:discourse /shared/uploads /shared/backups 2>/dev/null || true
+  echo "[migrate-uploads] done"
+fi
+
+touch "$SENTINEL"