Merge branch 'next' into main

This commit is contained in:
Leon Adomaitis
2024-06-23 03:56:50 +02:00
committed by GitHub
160 changed files with 2559 additions and 527 deletions

View File

@@ -9,7 +9,7 @@ services:
image: docker.io/library/postgres:12-alpine
restart: unless-stopped
healthcheck:
test: ["CMD-SHELL", "pg_isready -d authentik -U $${SERVICE_USER_POSTGRESQL}"]
test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
interval: 2s
timeout: 10s
retries: 15
@@ -55,8 +55,10 @@ services:
- ./media:/media
- ./custom-templates:/templates
depends_on:
- postgresql
- redis
postgresql:
condition: service_healthy
redis:
condition: service_healthy
authentik-worker:
image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2024.2.2}
restart: unless-stopped
@@ -90,5 +92,7 @@ services:
- ./certs:/certs
- ./custom-templates:/templates
depends_on:
- postgresql
- redis
postgresql:
condition: service_healthy
redis:
condition: service_healthy

View File

@@ -1012,7 +1012,7 @@ services:
"-o",
"/dev/null",
"-H",
"Authorization: Bearer ${ANON_KEY}",
"Authorization: Bearer ${SERVICE_SUPABASEANON_KEY}",
"http://127.0.0.1:4000/api/tenants/realtime-dev/health"
]
timeout: 5s