chore: publish 0.10.0+0.69.2 release

Reviewed-on: coop-cloud/outline#16

.env.sample

@@ -55,18 +55,20 @@ DEBUG=http
 # set, all domains are allowed by default when using Google OAuth to signin
 ALLOWED_DOMAINS=
 
-# TODO: setup compose.smtp.yml
 # To support sending outgoing transactional emails such as "document updated" or
 # "you've been invited" you'll need to provide authentication for an SMTP server
+# By default, this enables email login. You can disable this in the settings
+# for configuration details see https://docs.getoutline.com/s/hosting/doc/smtp-cqCJyZGMIB
+#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 #SMTP_ENABLED=1
 #SMTP_HOST=
 #SMTP_PORT=
 #SMTP_USERNAME=
-#SMTP_PASSWORD=
 #SMTP_FROM_EMAIL=
 #SMTP_REPLY_EMAIL=
 #SMTP_TLS_CIPHERS=
 #SMTP_SECURE=true
+#SECRET_SMTP_PASSWORD_VERSION=v1
 
 #COMPOSE_FILE="$COMPOSE_FILE:compose.oidc.yml"
 #OIDC_ENABLED=1

README.md

@@ -9,7 +9,7 @@ Wiki and knowledge base for growing teams
 * **Image**: [outlinewiki/outline](https://hub.docker.com/r/outlinewiki/outline)
 * **Healthcheck**: No
 * **Backups**: No
-* **Email**: No
+* **Email**: Yes
 * **Tests**: No
 * **SSO**: 3 (OAuth)
 

abra.sh

@@ -1,4 +1,4 @@
-export APP_ENTRYPOINT_VERSION=v6
+export APP_ENTRYPOINT_VERSION=v7
 export DB_ENTRYPOINT_VERSION=v1
 
 migrate() {

compose.smtp.yml

@@ -0,0 +1,18 @@
+version: "3.8"
+services:
+  app:
+    secrets:
+      - smtp_password
+    environment:
+      - SMTP_HOST
+      - SMTP_PORT
+      - SMTP_USERNAME
+      - SMTP_FROM_EMAIL
+      - SMTP_REPLY_EMAIL
+      - SMTP_TLS_CIPHERS
+      - SMTP_SECURE
+
+secrets:
+  smtp_password:
+    external: true
+    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}

compose.yml

@@ -43,7 +43,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=0.8.0+0.69.2"
+        - "coop-cloud.${STACK_NAME}.version=0.10.0+0.69.2"
         ## Redirect from EXTRA_DOMAINS to DOMAIN
         #- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
         #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"

entrypoint.postgres.sh.tmpl

@@ -7,7 +7,7 @@ OLDDATA=$PGDATA/old_data
 NEWDATA=$PGDATA/new_data
 
 if [ -e $MIGRATION_MARKER ]; then
-  echo "FATAL: previous migration not completed. manual restore necessary"
+  echo "FATAL: migration was started but did not complete in a previous run. manual recovery necessary"
   exit 1
 fi
 
@@ -27,7 +27,7 @@ if [ -n "$DATA_VERSION" -a "$PG_MAJOR" != "$DATA_VERSION" ]; then
   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"
+  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

entrypoint.sh.tmpl

@@ -2,6 +2,10 @@
 
 export AWS_SECRET_ACCESS_KEY=$(cat /run/secrets/aws_secret_key)
 
+{{ if eq (env "SMTP_ENABLED") "1" }}
+export SMTP_PASSWORD=$(cat /run/secrets/smtp_password)
+{{ end }}
+
 {{ if eq (env "OIDC_ENABLED") "1" }}
 export OIDC_CLIENT_SECRET=$(cat /run/secrets/oidc_client_secret)
 {{ end }}