mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-10 16:15:12 +00:00
feat: add DSN/URL connection string support for PostgreSQL and Redis (#11729)
This commit is contained in:
@@ -53,8 +53,14 @@ [email protected]
|
||||
POSTGRES_DB=zitadel
|
||||
POSTGRES_ADMIN_USER=postgres
|
||||
POSTGRES_ADMIN_PASSWORD=postgres
|
||||
POSTGRES_ZITADEL_USER=zitadel
|
||||
POSTGRES_ZITADEL_PASSWORD=zitadel
|
||||
# DSN used by ZITADEL to connect to PostgreSQL.
|
||||
# The start-from-init command uses this DSN to create the database schema and for
|
||||
# normal operation. When a DSN is configured, ZITADEL does not create or switch
|
||||
# to a separate unprivileged database user; the user in this DSN is used directly
|
||||
# and must already exist. For production, configure this DSN to use a non-superuser
|
||||
# role with only the permissions ZITADEL needs.
|
||||
# See https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING
|
||||
ZITADEL_DATABASE_POSTGRES_DSN=postgresql://postgres:postgres@postgres:5432/zitadel?sslmode=disable
|
||||
|
||||
# -----------------------------
|
||||
# Access logs
|
||||
@@ -67,9 +73,9 @@ ZITADEL_ACCESS_LOG_STDOUT_ENABLED=true
|
||||
# Enable with --profile cache and switch connectors to redis.
|
||||
# -----------------------------
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_ENABLED=false
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_ADDR=redis:6379
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_USERNAME=
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_PASSWORD=
|
||||
# DSN used by ZITADEL to connect to Redis.
|
||||
# See https://redis.io/docs/latest/develop/tools/cli/#host-port-password-and-database
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_URL=redis://redis:6379/0
|
||||
ZITADEL_CACHES_INSTANCE_CONNECTOR=
|
||||
ZITADEL_CACHES_MILESTONES_CONNECTOR=
|
||||
ZITADEL_CACHES_ORGANIZATION_CONNECTOR=
|
||||
|
||||
@@ -32,8 +32,7 @@ TRAEFIK_TRUSTED_IPS=10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
|
||||
POSTGRES_DB=zitadel
|
||||
POSTGRES_ADMIN_USER=postgres
|
||||
POSTGRES_ADMIN_PASSWORD=postgres
|
||||
POSTGRES_ZITADEL_USER=zitadel
|
||||
POSTGRES_ZITADEL_PASSWORD=zitadel
|
||||
ZITADEL_DATABASE_POSTGRES_DSN=postgresql://postgres:postgres@postgres:5432/zitadel?sslmode=disable
|
||||
|
||||
# Disable access logs to reduce noise in test output
|
||||
ZITADEL_ACCESS_LOG_STDOUT_ENABLED=false
|
||||
@@ -46,9 +45,7 @@ ZITADEL_INSTRUMENTATION_TRACE_EXPORTER_INSECURE=false
|
||||
|
||||
# Cache disabled (no Redis profile)
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_ENABLED=false
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_ADDR=redis:6379
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_USERNAME=
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_PASSWORD=
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_URL=redis://redis:6379/0
|
||||
ZITADEL_CACHES_INSTANCE_CONNECTOR=
|
||||
ZITADEL_CACHES_MILESTONES_CONNECTOR=
|
||||
ZITADEL_CACHES_ORGANIZATION_CONNECTOR=
|
||||
|
||||
@@ -1,13 +1,5 @@
|
||||
x-zitadel-db-env: &zitadel-db-env
|
||||
ZITADEL_DATABASE_POSTGRES_HOST: postgres
|
||||
ZITADEL_DATABASE_POSTGRES_PORT: 5432
|
||||
ZITADEL_DATABASE_POSTGRES_DATABASE: ${POSTGRES_DB}
|
||||
ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME: ${POSTGRES_ADMIN_USER}
|
||||
ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD: ${POSTGRES_ADMIN_PASSWORD}
|
||||
ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE: disable
|
||||
ZITADEL_DATABASE_POSTGRES_USER_USERNAME: ${POSTGRES_ZITADEL_USER}
|
||||
ZITADEL_DATABASE_POSTGRES_USER_PASSWORD: ${POSTGRES_ZITADEL_PASSWORD}
|
||||
ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE: disable
|
||||
ZITADEL_DATABASE_POSTGRES_DSN: ${ZITADEL_DATABASE_POSTGRES_DSN}
|
||||
|
||||
services:
|
||||
zitadel-init:
|
||||
|
||||
@@ -40,15 +40,7 @@ services:
|
||||
ZITADEL_EXTERNALSECURE: ${ZITADEL_EXTERNALSECURE}
|
||||
ZITADEL_TLS_ENABLED: false
|
||||
|
||||
ZITADEL_DATABASE_POSTGRES_HOST: postgres
|
||||
ZITADEL_DATABASE_POSTGRES_PORT: 5432
|
||||
ZITADEL_DATABASE_POSTGRES_DATABASE: ${POSTGRES_DB}
|
||||
ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME: ${POSTGRES_ADMIN_USER}
|
||||
ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD: ${POSTGRES_ADMIN_PASSWORD}
|
||||
ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE: disable
|
||||
ZITADEL_DATABASE_POSTGRES_USER_USERNAME: ${POSTGRES_ZITADEL_USER}
|
||||
ZITADEL_DATABASE_POSTGRES_USER_PASSWORD: ${POSTGRES_ZITADEL_PASSWORD}
|
||||
ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE: disable
|
||||
ZITADEL_DATABASE_POSTGRES_DSN: ${ZITADEL_DATABASE_POSTGRES_DSN}
|
||||
|
||||
ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORDCHANGEREQUIRED: false
|
||||
ZITADEL_FIRSTINSTANCE_LOGINCLIENTPATPATH: /zitadel/bootstrap/login-client.pat
|
||||
@@ -70,9 +62,7 @@ services:
|
||||
ZITADEL_INSTRUMENTATION_SERVICENAME: ${ZITADEL_INSTRUMENTATION_SERVICENAME}
|
||||
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_ENABLED: ${ZITADEL_CACHES_CONNECTORS_REDIS_ENABLED}
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_ADDR: ${ZITADEL_CACHES_CONNECTORS_REDIS_ADDR}
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_USERNAME: ${ZITADEL_CACHES_CONNECTORS_REDIS_USERNAME}
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_PASSWORD: ${ZITADEL_CACHES_CONNECTORS_REDIS_PASSWORD}
|
||||
ZITADEL_CACHES_CONNECTORS_REDIS_URL: ${ZITADEL_CACHES_CONNECTORS_REDIS_URL}
|
||||
ZITADEL_CACHES_INSTANCE_CONNECTOR: ${ZITADEL_CACHES_INSTANCE_CONNECTOR}
|
||||
ZITADEL_CACHES_MILESTONES_CONNECTOR: ${ZITADEL_CACHES_MILESTONES_CONNECTOR}
|
||||
ZITADEL_CACHES_ORGANIZATION_CONNECTOR: ${ZITADEL_CACHES_ORGANIZATION_CONNECTOR}
|
||||
@@ -149,7 +139,7 @@ services:
|
||||
- CMD
|
||||
- /bin/sh
|
||||
- -c
|
||||
- node /app/healthcheck.js http://localhost:3000/ui/v2/login/healthy
|
||||
- node /app/healthcheck.mjs http://localhost:3000/ui/v2/login/healthy
|
||||
interval: 10s
|
||||
timeout: 30s
|
||||
retries: 12
|
||||
|
||||
Reference in New Issue
Block a user