chore: publish 0.6.1+3.1.1 release

README.md

@@ -42,6 +42,10 @@ A platform for community discussion
 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`

abra.sh

@@ -0,0 +1 @@
+export DB_ENTRYPOINT_VERSION=v1

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: bitnami/discourse:3.0.1
+    image: bitnami/discourse:3.1.1
     networks:
       - proxy
       - internal
@@ -43,22 +43,27 @@ services:
         #- "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.4.0+3.0.1"
+        - "coop-cloud.${STACK_NAME}.version=0.6.1+3.1.1"
-    # healthcheck:
+    healthcheck:
-    #   test: ["CMD", "curl", "-f", "http://localhost:3000"]
+      test: "ruby -e \"require 'uri'; require 'net/http'; uri = URI('http://localhost:3000'); res = Net::HTTP.get_response(uri); if res.is_a?(Net::HTTPSuccess) then exit (0) else exit (1) end\""
-    #   interval: 30s
+      interval: 30s
-    #   timeout: 10s
+      timeout: 10s
-    #   retries: 10
+      retries: 6
-    #   start_period: 1m
+      start_period: 5m
 
   db:
-    image: postgres:13-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
@@ -72,20 +77,20 @@ services:
         backupbot.backup.path: "/tmp/backup.sql"
 
   redis:
-    image: redis:7.0-alpine
+    image: redis:7.2-alpine
     networks:
       - internal
     volumes:
       - 'redis_data:/data'
 
   sidekiq:
-    image: bitnami/discourse:3.0.1
+    image: bitnami/discourse:3.1.1
     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
@@ -115,9 +120,14 @@ volumes:
   postgresql_data:
   redis_data:
   discourse_data:
-  sidekiq_data:
 
 networks:
   proxy:
     external: true
   internal:
+
+configs:
+  db_entrypoint:
+    name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
+    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