update README and Discourse version

.drone.yml

@@ -1,23 +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
-      networks:
-        - proxy
-    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 -c compose.yaml -c compose.smtpauth.yaml
+```

compose.smtpauth.yaml

@@ -1,6 +1,3 @@
----
-version: "3.8"
-
 services:
   app:
     environment:
@@ -17,4 +14,4 @@ services:
 secrets:
   smtp_password:
     external: true
-    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
+    name: ${STACK_NAME}_smtp_password

compose.yaml

@@ -1,25 +1,24 @@
----
-version: "3.8"
-
 services:
   app:
-    image: bitnami/discourse:2.8.9
+    image: bitnami/discourse:3.1.1
     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_HOST=${STACK_NAME}_db
       - DISCOURSE_DATABASE_NAME=discourse
       - DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
+      - DISCOURSE_DATABASE_USER=discourse
+      - DISCOURSE_HOST=${DOMAIN}
+      - DISCOURSE_NOTIFICATION_EMAIL
+      - DISCOURSE_SMTP_AUTH
       - DISCOURSE_SMTP_HOST
       - DISCOURSE_SMTP_PORT
-      - DISCOURSE_SMTP_USER
       - DISCOURSE_SMTP_PROTOCOL
-      - DISCOURSE_SMTP_AUTH
+      - DISCOURSE_SMTP_USER
+      - PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0
     volumes:
       - 'discourse_data:/bitnami/discourse'
     secrets:
@@ -37,11 +36,6 @@ 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}"
-        ## 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}"
-        - "coop-cloud.${STACK_NAME}.version=0.2.1+2.8.9"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost:3000"]
     #   interval: 30s
@@ -50,65 +44,82 @@ services:
     #   start_period: 1m
 
   db:
-    image: postgres:11-alpine
+    image: postgres:13
     networks:
       - internal
     secrets:
       - db_password
     volumes:
       - 'postgresql_data:/var/lib/postgresql/data'
+    configs:
+      - source: db_entrypoint
+        target: /docker-entrypoint.sh
+        mode: 0555
+    entrypoint: /docker-entrypoint.sh
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
       - POSTGRES_USER=discourse
       - POSTGRES_DB=discourse
       - POSTGRES_PASSWORD_FILE=/run/secrets/db_password
+    deploy:
+      labels:
+        backupbot.backup: "true"
+        backupbot.backup.pre-hook: "bash -c 'PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /tmp/backup.sql'"
+        backupbot.backup.post-hook: "rm -rf /tmp/backup.sql"
+        backupbot.backup.path: "/tmp/backup.sql"
 
   redis:
-    image: redis:6.0-alpine
+    image: redis:7.2-alpine
     networks:
       - internal
     volumes:
       - 'redis_data:/data'
 
   sidekiq:
-    image: bitnami/discourse:2.8.9
+    image: bitnami/discourse:3.0.6
     networks:
       - internal
     depends_on:
       - discourse
     volumes:
-      - 'sidekiq_data:/bitnami/discourse'
+      - 'discourse_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_NAME=discourse
+      - DISCOURSE_DATABASE_PASSWORD_FILE=/run/secrets/db_password
       - DISCOURSE_DATABASE_PORT_NUMBER=5432
       - DISCOURSE_DATABASE_USER=discourse
-      - DISCOURSE_DATABASE_NAME=discourse
+      - DISCOURSE_HOST=${DOMAIN}
       - 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_USER
+      - PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY=0
       - DISCOURSE_SMTP_AUTH
 
 secrets:
   db_password:
     external: true
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_password
 
 volumes:
   postgresql_data:
   redis_data:
   discourse_data:
-  sidekiq_data:
 
 networks:
   proxy:
     external: true
   internal:
+
+configs:
+  db_entrypoint:
+    name: ${STACK_NAME}_db_entrypoint
+    file: entrypoint.postgres.sh.tmpl
+    template_driver: golang

entrypoint.postgres.sh.tmpl

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -e
+
+MIGRATION_MARKER=$PGDATA/migration_in_progress
+OLDDATA=$PGDATA/old_data
+NEWDATA=$PGDATA/new_data
+
+echo "Running as $(id)"
+
+if [ -e $MIGRATION_MARKER ]; then
+  echo "FATAL: migration was started but did not complete in a previous run. manual recovery necessary"
+  exit 1
+fi
+
+if [ -f $PGDATA/PG_VERSION ]; then
+  DATA_VERSION=$(cat $PGDATA/PG_VERSION)
+
+  if [ -n "$DATA_VERSION" -a "$PG_MAJOR" != "$DATA_VERSION" ]; then
+    echo "postgres data version $DATA_VERSION found, but need $PG_MAJOR. Starting migration"
+    echo "Installing postgres $DATA_VERSION"
+    sed -i "s/$/ $DATA_VERSION/" /etc/apt/sources.list.d/pgdg.list
+    apt-get update && apt-get install -y --no-install-recommends \
+      postgresql-$DATA_VERSION \
+      && rm -rf /var/lib/apt/lists/*
+    echo "shuffling around"
+    gosu postgres mkdir $OLDDATA $NEWDATA
+    chmod 700 $OLDDATA $NEWDATA
+    mv $PGDATA/* $OLDDATA/ || true
+    touch $MIGRATION_MARKER
+    echo "running initdb"
+    # abuse entrypoint script for initdb by making server error out
+    gosu postgres bash -c "export PGDATA=$NEWDATA ; /usr/local/bin/docker-entrypoint.sh --invalid-arg || true"
+    echo "running pg_upgrade"
+    cd /tmp
+    gosu postgres pg_upgrade --link -b /usr/lib/postgresql/$DATA_VERSION/bin -d $OLDDATA -D $NEWDATA -U $POSTGRES_USER
+    cp $OLDDATA/pg_hba.conf $NEWDATA/
+    mv $NEWDATA/* $PGDATA
+    rm -rf $OLDDATA
+    rmdir $NEWDATA
+    rm $MIGRATION_MARKER
+    echo "migration complete"
+  fi
+fi
+
+/usr/local/bin/docker-entrypoint.sh postgres