fix(deploy): .env per env_file explizit laden statt Variable-Substitution
Verhindert, dass Variablen leer bleiben wenn docker compose nicht aus dem deploy/-Verzeichnis heraus aufgerufen wird. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
b3fd512d25
commit
600cc10d30
2 changed files with 13 additions and 20 deletions
|
|
@ -1,14 +1,10 @@
|
||||||
# Datenbank-Passwort (wird auch intern vom Backend genutzt)
|
# PostgreSQL
|
||||||
MORZ_DB_PASSWORD=sicheres-passwort-hier
|
POSTGRES_PASSWORD=sicheres-passwort-hier
|
||||||
|
|
||||||
# Initialer Admin-Benutzer (Tenant: MORZ_DEFAULT_TENANT)
|
# Backend
|
||||||
# Leer lassen = zufälliges Passwort wird generiert und ins Log geschrieben
|
MORZ_INFOBOARD_DATABASE_URL=postgres://morz_infoboard:sicheres-passwort-hier@db:5432/morz_infoboard?sslmode=disable
|
||||||
MORZ_ADMIN_PASSWORD=
|
MORZ_INFOBOARD_ADMIN_PASSWORD=
|
||||||
|
MORZ_INFOBOARD_DEFAULT_TENANT=morz
|
||||||
# Standard-Tenant-Slug
|
MORZ_INFOBOARD_MQTT_BROKER=tcp://mqtt:1883
|
||||||
MORZ_DEFAULT_TENANT=morz
|
MORZ_INFOBOARD_MQTT_USERNAME=
|
||||||
|
MORZ_INFOBOARD_MQTT_PASSWORD=
|
||||||
# MQTT-Broker – intern erreichbar über den mqtt-Service
|
|
||||||
MORZ_MQTT_BROKER=tcp://mqtt:1883
|
|
||||||
MORZ_MQTT_USERNAME=
|
|
||||||
MORZ_MQTT_PASSWORD=
|
|
||||||
|
|
|
||||||
|
|
@ -4,16 +4,12 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:8080:8080"
|
- "127.0.0.1:8080:8080"
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
environment:
|
environment:
|
||||||
MORZ_INFOBOARD_HTTP_ADDR: ":8080"
|
MORZ_INFOBOARD_HTTP_ADDR: ":8080"
|
||||||
MORZ_INFOBOARD_DATABASE_URL: "postgres://morz_infoboard:${MORZ_DB_PASSWORD}@db:5432/morz_infoboard?sslmode=disable"
|
|
||||||
MORZ_INFOBOARD_UPLOAD_DIR: /app/uploads
|
MORZ_INFOBOARD_UPLOAD_DIR: /app/uploads
|
||||||
MORZ_INFOBOARD_STATUS_STORE_PATH: /app/data/status
|
MORZ_INFOBOARD_STATUS_STORE_PATH: /app/data/status
|
||||||
MORZ_INFOBOARD_MQTT_BROKER: "${MORZ_MQTT_BROKER}"
|
|
||||||
MORZ_INFOBOARD_MQTT_USERNAME: "${MORZ_MQTT_USERNAME}"
|
|
||||||
MORZ_INFOBOARD_MQTT_PASSWORD: "${MORZ_MQTT_PASSWORD}"
|
|
||||||
MORZ_INFOBOARD_ADMIN_PASSWORD: "${MORZ_ADMIN_PASSWORD}"
|
|
||||||
MORZ_INFOBOARD_DEFAULT_TENANT: "${MORZ_DEFAULT_TENANT:-morz}"
|
|
||||||
MORZ_INFOBOARD_DEV_MODE: "false"
|
MORZ_INFOBOARD_DEV_MODE: "false"
|
||||||
TZ: "Europe/Berlin"
|
TZ: "Europe/Berlin"
|
||||||
volumes:
|
volumes:
|
||||||
|
|
@ -29,9 +25,10 @@ services:
|
||||||
db:
|
db:
|
||||||
image: postgres:17-alpine
|
image: postgres:17-alpine
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
env_file:
|
||||||
|
- .env
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_USER: morz_infoboard
|
POSTGRES_USER: morz_infoboard
|
||||||
POSTGRES_PASSWORD: "${MORZ_DB_PASSWORD}"
|
|
||||||
POSTGRES_DB: morz_infoboard
|
POSTGRES_DB: morz_infoboard
|
||||||
volumes:
|
volumes:
|
||||||
- db_data:/var/lib/postgresql/data
|
- db_data:/var/lib/postgresql/data
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue