diff --git a/README.md b/README.md index 5c64cae..d1e7104 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Avoid the use of quotes (`"..."`) as much as possible, the NodeJS scripts flip o ### Deleting a user (e.g. to fix SSO weirdness) -`abra app cmd YOURAPPNAME postgres delete_user ` +`abra app cmd YOURAPPNAME db delete_user ` Where `` is the username of the user to be removed, and `` is the username of another user, to assign documents and diff --git a/abra.sh b/abra.sh index 089f855..3f6b1dd 100644 --- a/abra.sh +++ b/abra.sh @@ -1,8 +1,8 @@ -export APP_ENTRYPOINT_VERSION=v4 +export APP_ENTRYPOINT_VERSION=v5 migrate() { export DATABASE_PASSWORD=$(cat /run/secrets/db_password) - export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_postgres:5432/outline" + export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_db:5432/outline" yarn db:migrate --env=production-ssl-disabled } diff --git a/compose.yml b/compose.yml index 3340660..edaabdb 100644 --- a/compose.yml +++ b/compose.yml @@ -49,12 +49,12 @@ services: #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true" #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}" - redis: + cache: image: redis:6.2.6 networks: - backend - postgres: + db: image: postgres:11 networks: - backend diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl index aad5a2b..f5c517b 100644 --- a/entrypoint.sh.tmpl +++ b/entrypoint.sh.tmpl @@ -13,6 +13,6 @@ 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) -export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_postgres:5432/outline" +export DATABASE_URL="postgres://outline:${DATABASE_PASSWORD}@${STACK_NAME}_db:5432/outline" /usr/local/bin/yarn start "$@" diff --git a/release/0.3.0+0.64.3 b/release/0.3.0+0.64.3 index f96233e..6ada3f7 100644 --- a/release/0.3.0+0.64.3 +++ b/release/0.3.0+0.64.3 @@ -19,6 +19,10 @@ users are enjoying using it. See https://git.coopcloud.tech/coop-cloud/outline#deleting-a-user-e-g-to-fix-sso-weirdness for more. +- Furthermore, following https://git.coopcloud.tech/coop-cloud/outline/issues/9, you will + need to undeploy your stack and re-deploy as some of the services have been renamed to + maintain naming conventions with other recipes. + There has been a lot of changes. Please add to this file if you see more weirdness to help the rest of the Co-op Cloud Comrades.