Drop the legacy bitnami volume now that uploads are migrated

Reviewed-on: #19

.drone.yml

@@ -1,21 +0,0 @@
----
-kind: pipeline
-name: deploy to swarm-test.autonomic.zone
-steps:
-  - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
-    settings:
-      host: swarm-test.autonomic.zone
-      stack: discourse
-      generate_secrets: true
-      purge: true
-      deploy_key:
-        from_secret: drone_ssh_swarm_test
-    environment:
-      DOMAIN: discourse.swarm-test.autonomic.zone
-      STACK_NAME: discourse
-      LETS_ENCRYPT_ENV: production
-      SECRET_DB_PASSWORD_VERSION: v1
-trigger:
-  branch:
-    - main

.env.sample

@@ -1,19 +0,0 @@
-TYPE=discourse
-
-DOMAIN=discourse.example.com
-## Domain aliases
-#EXTRA_DOMAINS=', `www.discourse.example.com`'
-LETS_ENCRYPT_ENV=production
-
-# Outgoing email
-#DISCOURSE_SMTP_HOST=
-#DISCOURSE_SMTP_PORT=
-#DISCOURSE_SMTP_USER=
-#DISCOURSE_SMTP_PROTOCOL=
-#DISCOURSE_SMTP_AUTH=
-
-# SMTP authentication
-#COMPOSE_FILE="compose.yml:compose.smtpauth.yml"
-#SECRET_SMTP_PASSWORD_VERSION=v1
-
-SECRET_DB_PASSWORD_VERSION=v1

.gitignore

@@ -0,0 +1 @@
+.env

README.md

@@ -1,47 +1,24 @@
 # Discourse
 
-[![Build Status](https://build.coopcloud.tech/api/badges/coop-cloud/discourse/status.svg?ref=refs/heads/main)](https://build.coopcloud.tech/coop-cloud/discourse)
+Wiki Cafe's configuration for a Discourse deployment. Originally slimmed down from an `abra` [recipe](https://git.coopcloud.tech/coop-cloud/discourse) by [Co-op Cloud](https://coopcloud.tech/).
 
-A platform for community discussion
 
-<!-- metadata -->
-* **Category**: Apps
-* **Status**: 
-* **Image**: [`bitnami/discourse`](https://hub.docker.com/r/bitname/discourse)
-* **Healthcheck**: yes
-* **Backups**: no
-* **Email**: yes
-* **Tests**: no
-* **SSO**: no
-<!-- endmetadata -->
+## Deploying the app with Docker Swarm
 
-## Basic usage
+Set the environment variables from the .env file during the shell session.
 
-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
-   to save secrets in `pass`)
-4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
-   your Docker swarm box
-5. `abra app YOURAPPDOMAIN deploy`
-6. Open the configured domain in your browser to finish set-up
+```
+set -a && source .env && set +a
+```
 
-[`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
-[`coop-cloud/traefik`]: https://git.autonomic.zone/coop-cloud/traefik
+Set the secrets.
 
-## To add a new Admin user
+```
+printf "SECRET_HERE" | docker secret create SECRET_NAME -
+```
 
-1. Login to the instance `abra app run APPNAME app sh`
-2. `cd /opt/bitnami/discourse`
-3. `RAILS_ENV=production bundle exec rake admin:create` and follow prompts.
+Deploy using the `-c` flag to specify one or multiple compose files.
 
-## Install plugins
-
-1. Login to instance `abra app run APPNAME app sh`
-2. `cd /bitnami/discourse/plugins/`
-3. `git clone plugingit` for example `https://github.com/discourse/discourse-openid-connect.git`
-4. `abra app restart APPNAME app`
-
-## Setup Notes
-
-Until issue #1 is fixed, the default user is `user` and the default password is `bitnami123`
+```
+docker stack deploy discourse --detach=true -c compose.yaml -c compose.smtpauth.yaml
+```

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,15 @@
+#!/bin/bash
+# Co-op Cloud wrapper around the official image's /sbin/boot.
+# discourse/discourse reads passwords from the process env (pups/Ruby; it has no
+# *_FILE support), so inject them from the docker secrets before booting.
+set -e
+
+if [ -f /run/secrets/db_password ]; then
+  export DISCOURSE_DB_PASSWORD="$(cat /run/secrets/db_password)"
+fi
+
+if [ -f /run/secrets/smtp_password ]; then
+  export DISCOURSE_SMTP_PASSWORD="$(cat /run/secrets/smtp_password)"
+fi
+
+exec /sbin/boot

compose.smtpauth.yaml

@@ -0,0 +1,11 @@
+services:
+  app:
+    # the wrapper entrypoint reads /run/secrets/smtp_password and exports
+    # DISCOURSE_SMTP_PASSWORD (the official image has no *_FILE support)
+    secrets:
+      - smtp_password
+
+secrets:
+  smtp_password:
+    external: true
+    name: ${STACK_NAME}_smtp_password

compose.smtpauth.yml

@@ -1,20 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - DISCOURSE_SMTP_PASSWORD_FILE=/var/run/secrets/smtp_password
-    secrets:
-      - smtp_password
-
-  sidekiq:
-    environment:
-      - DISCOURSE_SMTP_PASSWORD_FILE=/var/run/secrets/smtp_password
-    secrets:
-      - smtp_password
-
-secrets:
-  smtp_password:
-    external: true
-    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}

compose.yaml

@@ -0,0 +1,153 @@
+
+services:
+  app:
+    image: discourse/discourse:2026.7.4
+    networks:
+      - proxy
+      - internal
+    # official image CMD is /sbin/boot; wrapper injects the DB password secret first
+    entrypoint: /usr/local/bin/cc-app-entrypoint.sh
+    environment:
+      - DISCOURSE_HOSTNAME=${DOMAIN}
+      - DISCOURSE_DEVELOPER_EMAILS=${DISCOURSE_DEVELOPER_EMAILS}
+      - DISCOURSE_DB_HOST=${STACK_NAME}_db
+      - DISCOURSE_DB_PORT=5432
+      - DISCOURSE_DB_NAME=discourse
+      - DISCOURSE_DB_USERNAME=discourse
+      - DISCOURSE_REDIS_HOST=${STACK_NAME}_redis
+      - DISCOURSE_REDIS_PORT=6379
+      - DISCOURSE_SMTP_ADDRESS
+      - DISCOURSE_SMTP_PORT
+      - DISCOURSE_SMTP_USER_NAME
+      - DISCOURSE_SMTP_PASSWORD
+      - DISCOURSE_SMTP_AUTHENTICATION
+      - DISCOURSE_SMTP_ENABLE_START_TLS
+      - DISCOURSE_NOTIFICATION_EMAIL
+    volumes:
+      - 'discourse_shared:/shared'
+    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: stop-first
+      labels:
+        - "traefik.enable=true"
+        - "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}"
+        - "caddy=${DOMAIN}"
+        - "caddy.reverse_proxy={{upstreams 80}}"
+        - "caddy.tls.on_demand="
+    healthcheck:
+      test: "curl -fsS http://localhost/srv/status || exit 1"
+      interval: 30s
+      timeout: 10s
+      retries: 6
+      start_period: 25m
+
+  db:
+    # discourse/postgres = pgvector + discourse's postgres management layer, which
+    # auto-upgrades an older cluster in place on boot (pg_upgrade into the versioned
+    # PGDATA /var/lib/postgresql/${MAJOR}/docker); everything is driven by the env below.
+    image: discourse/postgres:pg18
+    networks:
+      - internal
+    secrets:
+      - db_password
+    volumes:
+      # the image expects the whole cluster tree mounted here (not the data subdir);
+      # an existing pg17 cluster at the volume root is found and upgraded into /18/docker
+      - 'postgresql_data:/var/lib/postgresql'
+    configs:
+      - source: pg_backup
+        target: /pg_backup.sh
+        mode: 0555
+    entrypoint:
+      - /bin/bash
+      - -c
+      - |
+        if [ -f /run/secrets/db_password ]; then
+          DB_PASSWORD="$$(cat /run/secrets/db_password)"
+          export DB_PASSWORD POSTGRES_PASSWORD="$$DB_PASSWORD"
+        fi
+        exec run-postgres.sh postgres
+    environment:
+      # internal-only overlay network; keep all-trust so the app and the
+      # backup/restore hooks connect without juggling the superuser password
+      - POSTGRES_HOST_AUTH_METHOD=trust
+      - POSTGRES_DB=discourse
+      - DB_USER=discourse
+      # pg_upgrade runs as this role and initdb's the new cluster with it; it must
+      # match the OLD cluster's bootstrap superuser (oid 10). The image default
+      # `postgres` matches fresh installs and bitnami-origin clusters. Override in
+      # the app .env (POSTGRES_USER=...) only for a cluster bootstrapped differently.
+      - POSTGRES_USER=${POSTGRES_USER:-postgres}
+    healthcheck:
+      test: "pg_isready -U discourse -d discourse"
+      interval: 30s
+      timeout: 10s
+      retries: 5
+      start_period: 15m
+    deploy:
+      labels:
+        backupbot.backup: "true"
+        backupbot.backup.pre-hook: "/pg_backup.sh backup"
+        backupbot.backup.volumes.postgresql_data.path: "backup.sql"
+        backupbot.restore.post-hook: "/pg_backup.sh restore"
+
+  redis:
+    image: redis:8.10-alpine
+    networks:
+      - internal
+    volumes:
+      - 'redis_data:/data'
+    healthcheck:
+      test: "redis-cli ping | grep -q PONG"
+      interval: 30s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+
+secrets:
+  db_password:
+    external: true
+    name: ${STACK_NAME}_db_password
+
+volumes:
+  postgresql_data:
+  redis_data:
+  discourse_shared:
+
+networks:
+  proxy:
+    external: true
+  internal:
+
+configs:
+  app_entrypoint:
+    name: ${STACK_NAME}_app_entrypoint
+    file: cc-app-entrypoint.sh
+  app_install_ssl:
+    name: ${STACK_NAME}_app_install_ssl
+    file: app-install-ssl.sh
+  app_migrate_uploads:
+    name: ${STACK_NAME}_app_migrate_uploads
+    file: migrate-uploads.sh
+  pg_backup:
+    name: ${STACK_NAME}_pg_backup
+    file: pg_backup.sh

compose.yml

@@ -1,113 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    image: bitnami/discourse:2.7.7
-    networks:
-      - proxy
-      - internal
-    # entrypoint: ['tail', '-f', '/dev/null']
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - DISCOURSE_HOST=${DOMAIN}
-      - DISCOURSE_DATABASE_HOST=db
-      - DISCOURSE_DATABASE_USER=discourse
-      - DISCOURSE_DATABASE_NAME=discourse
-      - DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
-      - DISCOURSE_SMTP_HOST
-      - DISCOURSE_SMTP_PORT
-      - DISCOURSE_SMTP_USER
-      - DISCOURSE_SMTP_PROTOCOL
-      - DISCOURSE_SMTP_AUTH
-    volumes:
-      - 'discourse_data:/bitnami/discourse'
-    secrets:
-      - db_password
-    depends_on:
-      - db
-      - redis
-    deploy:
-      update_config:
-        failure_action: rollback
-        order: start-first
-      labels:
-        - "traefik.enable=true"
-        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=3000"
-        - "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
-        #- "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}"
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:3000"]
-      interval: 30s
-      timeout: 10s
-      retries: 10
-      start_period: 1m
-
-  db:
-    image: postgres:11-alpine
-    networks:
-      - internal
-    secrets:
-      - db_password
-    volumes:
-      - 'postgresql_data:/var/lib/postgresql/data'
-    environment:
-      - POSTGRES_HOST_AUTH_METHOD=trust
-      - POSTGRES_USER=discourse
-      - POSTGRES_DB=discourse
-      - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
-
-  redis:
-    image: redis:6.0-alpine
-    networks:
-      - internal
-    volumes:
-      - 'redis_data:/data'
-
-  sidekiq:
-    image: bitnami/discourse:2.7.7
-    networks:
-      - internal
-    depends_on:
-      - discourse
-    volumes:
-      - 'sidekiq_data:/bitnami/discourse'
-    command: /opt/bitnami/scripts/discourse-sidekiq/run.sh
-    secrets:
-      - db_password
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-      - DISCOURSE_HOST=${DOMAIN}
-      - DISCOURSE_DATABASE_HOST=db
-      - DISCOURSE_DATABASE_PORT_NUMBER=5432
-      - DISCOURSE_DATABASE_USER=discourse
-      - DISCOURSE_DATABASE_NAME=discourse
-      - DISCOURSE_REDIS_HOST=redis
-      - DISCOURSE_REDIS_PORT_NUMBER=6379
-      - DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
-      - DISCOURSE_SMTP_HOST
-      - DISCOURSE_SMTP_PORT
-      - DISCOURSE_SMTP_USER
-      - DISCOURSE_SMTP_PROTOCOL
-      - DISCOURSE_SMTP_AUTH
-
-secrets:
-  db_password:
-    external: true
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
-
-volumes:
-  postgresql_data:
-  redis_data:
-  discourse_data:
-  sidekiq_data:
-
-networks:
-  proxy:
-    external: true
-  internal:

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"

pg_backup.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Postgres backup/restore hook for the discourse `db` service (discourse/postgres image).
+
+set -e
+
+# 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}"
+
+# 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"
+}
+
+function restore {
+  cd "$DATADIR"
+
+  # Block all non-local connections so the running discourse app + sidekiq cannot reconnect and
+  # interfere with the drop/recreate/reimport. Restored on exit.
+  restore_hba() {
+    cat pg_hba.conf.bak > pg_hba.conf
+    rm -f pg_hba.conf.bak
+    su postgres -c "pg_ctl -D '$DATADIR' reload"
+  }
+  cp pg_hba.conf pg_hba.conf.bak
+  echo 'local all all trust' > pg_hba.conf
+  su postgres -c "pg_ctl -D '$DATADIR' reload"
+  trap restore_hba EXIT INT TERM
+
+  # terminate any lingering local sessions before recreate
+  # see https://stackoverflow.com/questions/5108876/kill-a-postgresql-session-connection
+  psql -U "$SU" -d postgres -c \
+    "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname='${DB_NAME}' AND pid<>pg_backend_pid();"
+
+  # drop database and then recreate it
+  psql -U "$SU" -d postgres -c "DROP DATABASE ${DB_NAME} WITH (FORCE);"
+  createdb -U "$SU" "$DB_NAME"
+
+  # reimport data
+  gunzip -c "$BACKUP_FILE" | psql -U "$SU" -d "$DB_NAME" -1 -v ON_ERROR_STOP=1 -f -
+}
+
+$@