From 8ba1d5db06140e93894e26a51e7833bf3ad64f71 Mon Sep 17 00:00:00 2001
From: Alejandro Sarmiento <alejandrosarsan@protonmail.com>
Date: Sun, 3 Mar 2024 22:27:12 +0100
Subject: [PATCH] Zitadel with env

---
 Zitadel/.env               |  2 +-
 Zitadel/docker-compose.yml | 26 +++++++++++++-------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Zitadel/.env b/Zitadel/.env
index a565692..8e030c4 100644
--- a/Zitadel/.env
+++ b/Zitadel/.env
@@ -1,5 +1,5 @@
 # ZITADEL service configurations
-MASTERKEY=RandomSecureMasterKey32Char1234
+MASTERKEY=RandomSecureMasterKey32Char1234 # openssl rand -base64 32
 ZITADEL_DATABASE_POSTGRES_HOST=db
 ZITADEL_DATABASE_POSTGRES_PORT=5432
 ZITADEL_DATABASE_POSTGRES_DATABASE=zitadel
diff --git a/Zitadel/docker-compose.yml b/Zitadel/docker-compose.yml
index a754474..b003314 100644
--- a/Zitadel/docker-compose.yml
+++ b/Zitadel/docker-compose.yml
@@ -6,18 +6,18 @@ services:
     networks:
       - 'zitadel'
     image: 'ghcr.io/zitadel/zitadel:latest'
-    command: 'start-from-init --masterkey "MasterkeyNeedsToHave32Characters" --tlsMode disabled'
+    command: 'start-from-init --masterkey "${MASTERKEY}" --tlsMode disabled'
     environment:
-      - 'ZITADEL_DATABASE_POSTGRES_HOST=db'
-      - 'ZITADEL_DATABASE_POSTGRES_PORT=5432'
-      - 'ZITADEL_DATABASE_POSTGRES_DATABASE=zitadel'
-      - 'ZITADEL_DATABASE_POSTGRES_USER_USERNAME=zitadel'
-      - 'ZITADEL_DATABASE_POSTGRES_USER_PASSWORD=zitadel'
-      - 'ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE=disable'
-      - 'ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME=postgres'
-      - 'ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD=postgres'
-      - 'ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE=disable'
-      - 'ZITADEL_EXTERNALSECURE=false'
+      - 'ZITADEL_DATABASE_POSTGRES_HOST=${ZITADEL_DATABASE_POSTGRES_HOST}'
+      - 'ZITADEL_DATABASE_POSTGRES_PORT=${ZITADEL_DATABASE_POSTGRES_PORT}'
+      - 'ZITADEL_DATABASE_POSTGRES_DATABASE=${ZITADEL_DATABASE_POSTGRES_DATABASE}'
+      - 'ZITADEL_DATABASE_POSTGRES_USER_USERNAME=${ZITADEL_DATABASE_POSTGRES_USER_USERNAME}'
+      - 'ZITADEL_DATABASE_POSTGRES_USER_PASSWORD=${ZITADEL_DATABASE_POSTGRES_USER_PASSWORD}'
+      - 'ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE=${ZITADEL_DATABASE_POSTGRES_USER_SSL_MODE}'
+      - 'ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME=${ZITADEL_DATABASE_POSTGRES_ADMIN_USERNAME}'
+      - 'ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD=${ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD}'
+      - 'ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE=${ZITADEL_DATABASE_POSTGRES_ADMIN_SSL_MODE}'
+      - 'ZITADEL_EXTERNALSECURE=${ZITADEL_EXTERNALSECURE}'
     depends_on:
       db:
         condition: 'service_healthy'
@@ -28,8 +28,8 @@ services:
     restart: 'always'
     image: postgres:16-alpine
     environment:
-      - POSTGRES_USER=postgres
-      - POSTGRES_PASSWORD=postgres
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
     networks:
       - 'zitadel'
     healthcheck: