fix docker-compose.* + .env*

- desktop-app
This commit is contained in:
2025-12-05 14:07:39 +01:00
parent 97baa85a70
commit 7a9795146c
4 changed files with 106 additions and 83 deletions
+9 -20
View File
@@ -7,6 +7,14 @@
PROJECT_NAME=meldestelle
RESTART_POLICY=no
# Docker build versions (optional overrides)
DOCKER_VERSION=1.0.0-SNAPSHOT
DOCKER_BUILD_DATE=2025-12-04T15:00:00Z
DOCKER_GRADLE_VERSION=9.1.0
DOCKER_JAVA_VERSION=21
DOCKER_NODE_VERSION=22.21.0
DOCKER_NGINX_VERSION=1.28.0-alpine
# Postgres
POSTGRES_IMAGE=postgres:16-alpine
POSTGRES_USER=pg-user
@@ -16,7 +24,6 @@ POSTGRES_PORT=5432:5432
POSTGRES_DB_URL=jdbc:postgresql://postgres:5432/pg-meldestelle-db
# --- REDIS ---
# Optional password for Redis; leave empty to disable authentication in dev
REDIS_IMAGE=redis:7.4-alpine
REDIS_PASSWORD=redis-password
REDIS_PORT=6379:6379
@@ -28,12 +35,8 @@ REDIS_SERVER_CONNECT_TIMEOUT=5s
KEYCLOAK_IMAGE_TAG=26.4
KC_ADMIN_USERNAME=kc-admin
KC_ADMIN_PASSWORD=kc-password
# Type der Datenbank (postgres, h2, mariadb, mysql, oracle, mssql)
KC_DB=postgres
# DB Schema 01-init-keycloak-schema.sql
KC_DB_SCHEMA=keycloak
# DB Verbindungsparameter
# KC_DB_URL=jdbc:postgresql://postgres:5432/pg-meldestelle-db
KC_HOSTNAME=localhost
KC_PORT=8180:8080
KC_DEBUG_PORT=9000:9000
@@ -58,10 +61,8 @@ GF_PORT=3000:3000
CONSUL_IMAGE=hashicorp/consul:1.22.1
CONSUL_PORT=8500:8500
CONSUL_UDP_PORT=8600:8600/udp
# Zentrale App-Config für Consul (interner Host/Port im Compose-Netz)
CONSUL_HOST=consul
CONSUL_HTTP_PORT=8500
# SPRING-CLOUD-CONSUL
SCLOUD_CONSUL_HOSTNAME=consul
SCLOUD_CONSUL_PORT=8500
@@ -71,13 +72,9 @@ GATEWAY_DEBUG_PORT=5005:5005
GATEWAY_SERVER_PORT=8081
GATEWAY_SPRING_PROFILES_ACTIVE=docker
GATEWAY_DEBUG=true
# Service-Registrierungsname in Consul (Anzeige in der UI)
GATEWAY_SERVICE_NAME=api-gateway
# TODO Check Keycloak-URI
# SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT
SSEC_ISSUER_URI=http://keycloak:8080/realms/meldestelle
SSEC_JWK_SET_URI=http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs
# SPRING-CLOUD-CONSUL
GATEWAY_CONSUL_HOSTNAME=api-gateway
GATEWAY_CONSUL_PREFER_IP=true
@@ -93,16 +90,8 @@ PING_CONSUL_PREFER_IP=true
# --- WEB-APP ---
WEB_APP_PORT=4000:4000
DOCKER_NODE_VERSION=22.21.0
DOCKER_NGINX_VERSION=1.28.0-alpine
WEB_BUILD_PROFILE=dev
# --- DESKTOP-APP ---
DESKTOP_APP_VNC_PORT=5900:5900
DESKTOP_APP_VNC_PORT=5901:5901
DESKTOP_APP_NOVNC_PORT=6080:6080
# Docker build versions (optional overrides)
DOCKER_VERSION=1.0.0-SNAPSHOT
DOCKER_BUILD_DATE=2025-12-04T15:00:00Z
DOCKER_GRADLE_VERSION=9.1.0
DOCKER_JAVA_VERSION=21