From a082f5096cfef8501260970f427f00a8014751b6 Mon Sep 17 00:00:00 2001 From: oabrivard Date: Wed, 4 Feb 2026 10:35:04 +0100 Subject: [PATCH] Fixed docker-compose.yml to use env variables for zitadel and grafana --- infrastructure/dev/docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/infrastructure/dev/docker-compose.yml b/infrastructure/dev/docker-compose.yml index cfa41c8..f6dc77c 100644 --- a/infrastructure/dev/docker-compose.yml +++ b/infrastructure/dev/docker-compose.yml @@ -49,12 +49,12 @@ services: env_file: - .env environment: - ZITADEL_MASTERKEY: "MasterkeyNeedsToHave32Characters" + ZITADEL_MASTERKEY: ${ZITADEL_MASTERKEY} ZITADEL_DATABASE_COCKROACH_HOST: crdb ZITADEL_EXTERNALSECURE: false - ZITADEL_FIRSTINSTANCE_ORG_NAME: "KnowFoolery" - ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: "admin" - ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: "AdminPassword123!" + ZITADEL_FIRSTINSTANCE_ORG_NAME: ${ZITADEL_ORG_NAME} + ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: ${ZITADEL_ADMIN_USERNAME} + ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: ${ZITADEL_ADMIN_PASSWORD} ports: - "${ZITADEL_PORT}:8080" depends_on: @@ -116,8 +116,8 @@ services: ports: - "${GRAFANA_PORT}:3000" environment: - GF_SECURITY_ADMIN_USER: admin - GF_SECURITY_ADMIN_PASSWORD: admin + GF_SECURITY_ADMIN_USER: ${GRAFANA_ADMIN_USER} + GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_ADMIN_PASSWORD} GF_USERS_ALLOW_SIGN_UP: false volumes: - grafana_data:/var/lib/grafana