chore: publish 1.1.0+0.73.1 release

[ci skip]

README.md

@@ -5,12 +5,12 @@ Wiki and knowledge base for growing teams
 <!-- metadata -->
 
 * **Category**: Apps
-* **Status**: 1, alpha
-* **Image**: [outlinewiki/outline](https://hub.docker.com/r/outlinewiki/outline)
+* **Status**: 3, beta
+* **Image**: [outlinewiki/outline](https://hub.docker.com/r/outlinewiki/outline), 4, upstream
 * **Healthcheck**: No
-* **Backups**: No
+* **Backups**: Yes
 * **Email**: Yes
-* **Tests**: No
+* **Tests**: 2
 * **SSO**: 3 (OAuth)
 
 <!-- endmetadata -->
@@ -19,10 +19,14 @@ Wiki and knowledge base for growing teams
 
 1. Set up Docker Swarm and [`abra`]
 2. Deploy [`coop-cloud/traefik`]
-3. `abra app new ${REPO_NAME} --secrets` (optionally with `--pass` if you'd like
-   to save secrets in `pass`)
+3. `abra app new ${REPO_NAME}`
+   - **WARNING**: Choose "n" when `abra` asks if you'd like to generate secrets
 4. `abra app config YOURAPPNAME` - be sure to change `$DOMAIN` to something that resolves to
-   your Docker swarm box
+   your Docker swarm box. For Minio, you'll want:
+   - `AWS_ACCESS_KEY_ID=<minio username>`
+   - `AWS_REGION="us-east-1"`
+   - `AWS_S3_UPLOAD_BUCKET_URL=https://minio.example.com`
+   - `AWS_S3_UPLOAD_BUCKET_NAME=
 5. `abra app deploy YOURAPPNAME`
 7. Open the configured domain in your browser to finish set-up
 
@@ -31,6 +35,12 @@ Wiki and knowledge base for growing teams
 
 ## Tips & Tricks
 
+### Create an initial admin user
+
+```
+abra app cmd YOURAPPNAME app create_email_user test@example.com
+```
+
 ### Post-deploy migration
 
 ```

abra.sh

@@ -1,5 +1,17 @@
-export APP_ENTRYPOINT_VERSION=v7
-export DB_ENTRYPOINT_VERSION=v1
+export APP_ENTRYPOINT_VERSION=v8
+export DB_ENTRYPOINT_VERSION=v2
+
+create_email_user() {
+	if [ -z "$1" ]; then
+		echo "Usage: ... create_email_user <email_address>"
+		exit 1
+	fi
+	export DATABASE_PASSWORD=$(cat /run/secrets/db_password)
+	export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_db:5432/outline"
+	export UTILS_SECRET=$(cat /run/secrets/utils_secret)
+	export SECRET_KEY=$(cat /run/secrets/secret_key)
+	node build/server/scripts/seed.js "$1"
+}
 
 migrate() {
 	export DATABASE_PASSWORD=$(cat /run/secrets/db_password)

compose.yml

@@ -6,7 +6,7 @@ services:
     networks:
       - backend
       - proxy
-    image: outlinewiki/outline:0.69.2
+    image: outlinewiki/outline:0.73.1
     secrets:
       - aws_secret_key
       - db_password
@@ -43,19 +43,19 @@ 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.10.0+0.69.2"
+        - "coop-cloud.${STACK_NAME}.version=1.1.0+0.73.1"
         ## 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}"
 
   cache:
-    image: redis:7.0.11
+    image: redis:7.2.3
     networks:
       - backend
 
   db:
-    image: postgres:15.3
+    image: postgres:15.5
     networks:
       - backend
     secrets:

entrypoint.postgres.sh.tmpl

@@ -11,32 +11,34 @@ if [ -e $MIGRATION_MARKER ]; then
   exit 1
 fi
 
-DATA_VERSION=$(cat $PGDATA/PG_VERSION)
+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"
+  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

entrypoint.sh.tmpl

@@ -19,5 +19,7 @@ export SECRET_KEY=$(cat /run/secrets/secret_key)
 export DATABASE_PASSWORD=$(cat /run/secrets/db_password)
 export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_db:5432/outline"
 
-/usr/local/bin/yarn db:migrate --env=production-ssl-disabled
-/usr/local/bin/yarn start "$@"
+if [ ! "$1" = "-e" ]; then
+	/usr/local/bin/yarn db:migrate --env=production-ssl-disabled
+	/usr/local/bin/yarn start "$@"
+fi