chore: publish 2.18.0+1.6.0 release

Reviewed-on: #21

.env.sample

@@ -4,6 +4,8 @@ TYPE=outline
 
 DOMAIN=outline.example.com
 
+#TIMEOUT=
+
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.outline.example.com`'
 LETS_ENCRYPT_ENV=production

README.md

@@ -71,12 +71,11 @@ revisions to (instead of deleting them).
 - `abra app deploy <domain> -f`
 - enjoy getting rid of S3 🥳
 
-## Single Sign On with Keycloak
+## Single Sign On with Keycloak/Authentik
 
-`abra app config YOURAPPNAME`, then uncomment everything in the `OIDC_` section.
-
-Create a new client in Keycloak:
-
-- **Valid Redirect URIs**: `https://YOURAPPDOMAIN/auth/oidc.callback`
-
-`abra app deploy YOURAPPDOMAIN`
+- Create an OIDC client in Keycloak (in Authentik this is called a provider and application)
+- Run `abra app config YOURAPPNAME`, then uncomment everything in the `OIDC_` section.
+  - **Valid Redirect URIs**: `https://YOURAPPDOMAIN/auth/oidc.callback`
+  - Reference the client/provider info to populate the `_AUTH_URI` `_TOKEN_URI` and `_USERINFO_URI` values
+- Set the OIDC secret using the value from the client/provider `abra app secret insert YOURAPPNAME oidc_client_secret v1 SECRETVALUE`
+- `abra app deploy YOURAPPDOMAIN`

abra.sh

@@ -1,4 +1,4 @@
-export APP_ENTRYPOINT_VERSION=v9
+export APP_ENTRYPOINT_VERSION=v11
 export DB_ENTRYPOINT_VERSION=v2
 export PG_BACKUP_VERSION=v1
 
@@ -98,3 +98,10 @@ delete_duplicate_users() {
 		delete_user_by_id "$USERID_OLD" "$USERID_NEW"
 	done
 }
+
+fix_collation_mismatch() {
+  psql -U ${POSTGRES_USER} -d outline -c "ALTER DATABASE outline REFRESH COLLATION VERSION;"
+  psql -U ${POSTGRES_USER} -d outline -c "REINDEX DATABASE outline;"
+  psql -U ${POSTGRES_USER} -d postgres -c "ALTER DATABASE postgres REFRESH COLLATION VERSION;"
+  psql -U ${POSTGRES_USER} -d postgres -c "REINDEX DATABASE postgres;"
+}

compose.yml

@@ -6,7 +6,7 @@ services:
     networks:
       - backend
       - proxy
-    image: outlinewiki/outline:0.82.0
+    image: outlinewiki/outline:1.6.0
     secrets:
       - db_password
       - secret_key
@@ -34,23 +34,20 @@ 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=2.9.0+0.82.0"
+        - "coop-cloud.${STACK_NAME}.version=2.18.0+1.6.0"
         # 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}.timeout=${TIMEOUT:-80}"
-    depends_on:
-      - cache
-      - db
+        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
 
   cache:
-    image: redis:7.4.2
+    image: redis:8.6.1
     networks:
       - backend
 
   db:
-    image: postgres:17.3
+    image: postgres:17.9
     networks:
       - backend
     secrets:

entrypoint.sh.tmpl

@@ -18,10 +18,9 @@ export GOOGLE_CLIENT_SECRET=$(cat /run/secrets/google_client_secret)
 
 export UTILS_SECRET=$(cat /run/secrets/utils_secret)
 export SECRET_KEY=$(cat /run/secrets/secret_key)
-export DATABASE_PASSWORD=$(cat /run/secrets/db_password)
+DATABASE_PASSWORD=$(cat /run/secrets/db_password)
 export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_db:5432/outline"
 
 if [ ! "$1" = "-e" ]; then
-	/usr/local/bin/yarn db:migrate --env=production-ssl-disabled
-	/usr/local/bin/yarn start "$@"
+  node build/server/index.js
 fi

release/2.17.0+1.5.0

@@ -0,0 +1 @@
+y

release/2.9.1+0.82.0

@@ -0,0 +1 @@
+Fixes a problem where deployments were consistently giving a timeout response even though they were successful