Fixed docker-compose.yml to use env variables for zitadel and grafana

master
oabrivard 1 month ago
parent 82c72f3a5c
commit a082f5096c

@ -49,12 +49,12 @@ services:
env_file: env_file:
- .env - .env
environment: environment:
ZITADEL_MASTERKEY: "MasterkeyNeedsToHave32Characters" ZITADEL_MASTERKEY: ${ZITADEL_MASTERKEY}
ZITADEL_DATABASE_COCKROACH_HOST: crdb ZITADEL_DATABASE_COCKROACH_HOST: crdb
ZITADEL_EXTERNALSECURE: false ZITADEL_EXTERNALSECURE: false
ZITADEL_FIRSTINSTANCE_ORG_NAME: "KnowFoolery" ZITADEL_FIRSTINSTANCE_ORG_NAME: ${ZITADEL_ORG_NAME}
ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: "admin" ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: ${ZITADEL_ADMIN_USERNAME}
ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: "AdminPassword123!" ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: ${ZITADEL_ADMIN_PASSWORD}
ports: ports:
- "${ZITADEL_PORT}:8080" - "${ZITADEL_PORT}:8080"
depends_on: depends_on:
@ -116,8 +116,8 @@ services:
ports: ports:
- "${GRAFANA_PORT}:3000" - "${GRAFANA_PORT}:3000"
environment: environment:
GF_SECURITY_ADMIN_USER: admin GF_SECURITY_ADMIN_USER: ${GRAFANA_ADMIN_USER}
GF_SECURITY_ADMIN_PASSWORD: admin GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_ADMIN_PASSWORD}
GF_USERS_ALLOW_SIGN_UP: false GF_USERS_ALLOW_SIGN_UP: false
volumes: volumes:
- grafana_data:/var/lib/grafana - grafana_data:/var/lib/grafana

Loading…
Cancel
Save