This commit is contained in:
2
abra.sh
2
abra.sh
@ -1,4 +1,4 @@
|
||||
export LOOMIO_ENTRYPOINT_VERSION=v7
|
||||
export LOOMIO_ENTRYPOINT_VERSION=v8
|
||||
|
||||
# cannot be integrated into entrypoint.sh as it requires the operator to create a user first
|
||||
function make_last_user_admin()
|
||||
|
||||
@ -11,6 +11,7 @@ x-oauth-env: &oauth-env
|
||||
OAUTH_ATTR_NAME:
|
||||
OAUTH_ATTR_EMAIL:
|
||||
OAUTH_LOGIN_PROVIDER_NAME:
|
||||
OAUTH_ENABLED:
|
||||
|
||||
services:
|
||||
app:
|
||||
@ -18,6 +19,11 @@ services:
|
||||
*oauth-env
|
||||
secrets:
|
||||
- oauth_app_secret
|
||||
worker:
|
||||
environment:
|
||||
*oauth-env
|
||||
secrets:
|
||||
- oauth_app_secret
|
||||
|
||||
secrets:
|
||||
oauth_app_secret:
|
||||
|
||||
@ -26,9 +26,9 @@ file_env "SECRET_COOKIE_TOKEN"
|
||||
file_env "POSTGRES_PASSWORD"
|
||||
file_env "SMTP_PASSWORD"
|
||||
|
||||
{{ if eq (env "OAUTH_ENABLED") "1" }}
|
||||
file_env "OAUTH_APP_SECRET"
|
||||
{{ end }}
|
||||
if [ "$OAUTH_ENABLED" = "1" ]; then
|
||||
file_env "OAUTH_APP_SECRET"
|
||||
fi
|
||||
|
||||
export DB_HOST="db"
|
||||
export DATABASE_URL="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db/${POSTGRES_DB}"
|
||||
|
||||
Reference in New Issue
Block a user