fix docker-compose.* + .env* Dateien auf den root übersiedelt

This commit is contained in:
2025-12-04 11:30:01 +01:00
parent 80ac574116
commit 6e4245d6a9
9 changed files with 7 additions and 8 deletions
-53
View File
@@ -1,53 +0,0 @@
# ==========================================
# Meldestelle Docker Compose Environment
# Single Source of Truth (SSoT)
# ==========================================
# --- PROJECT ---
# COMPOSE_PROJECT_NAME=meldestelle
# --- PORT MAPPINGS (host:container) ---
POSTGRES_PORT=5432:5432
REDIS_PORT=6379:6379
KC_PORT=8180:8080
CONSUL_PORT=8500:8500
PROMETHEUS_PORT=9090:9090
GF_PORT=3000:3000
WEB_APP_PORT=4000:80
PING_SERVICE_PORT=8082:8082
PING_DEBUG_PORT=5006:5006
GATEWAY_PORT=8081:8081
GATEWAY_DEBUG_PORT=5005:5005
GATEWAY_SERVER_PORT=8081
DESKTOP_APP_VNC_PORT=5900:5900
DESKTOP_APP_NOVNC_PORT=6080:6080
# Postgres
POSTGRES_USER=meldestelle
POSTGRES_PASSWORD=meldestelle
POSTGRES_DB=meldestelle
# --- REDIS ---
# Optional password for Redis; leave empty to disable authentication in dev
REDIS_PASSWORD=
# --- KEYCLOAK ---
KC_ADMIN_USER=admin
KC_ADMIN_PASSWORD=admin
KC_HOSTNAME=localhost
# --- PGADMIN ---
PGADMIN_EMAIL=admin@example.com
PGADMIN_PASSWORD=admin
# --- GRAFANA ---
GF_ADMIN_USER=admin
GF_ADMIN_PASSWORD=admin
# Docker build versions (optional overrides)
DOCKER_GRADLE_VERSION=9.1.0
DOCKER_JAVA_VERSION=21
DOCKER_NODE_VERSION=22.21.0
DOCKER_NGINX_VERSION=1.28.0-alpine
WEB_BUILD_PROFILE=dev
-153
View File
@@ -1,153 +0,0 @@
name: meldestelle-hardcoded
services:
# --- DATENBANK ---
postgres:
image: postgres:16-alpine
container_name: meldestelle-postgres
restart: unless-stopped
ports:
- "5432:5432"
environment:
POSTGRES_USER: pg-user
POSTGRES_PASSWORD: pg-password
POSTGRES_DB: meldestelle
volumes:
- postgres-data:/var/lib/postgresql/data
# Falls du Init-Scripte hast, lassen wir die erstmal weg,
# um Fehlerquellen zu reduzieren, oder lassen den Pfad, falls er existiert:
- ./docker/core/postgres:/docker-entrypoint-initdb.d:Z
healthcheck:
test: [ "CMD-SHELL", "pg_isready -U pg-user -d meldestelle" ]
interval: 1s
timeout: 5s
retries: 3
start_period: 30s
networks:
- meldestelle-network
# --- DATENBANK-MANAGEMENT-TOOL ---
pgadmin:
image: dpage/pgadmin4:8
container_name: pgadmin4_container
restart: unless-stopped
ports:
- "8888:80"
environment:
PGADMIN_DEFAULT_EMAIL: user@domain.com
PGADMIN_DEFAULT_PASSWORD: strong-password
volumes:
- pgadmin-data:/var/lib/pgadmin
healthcheck:
test: [ "CMD-SHELL", "wget --spider -q http://localhost:80/ || exit 1" ]
interval: 1s
timeout: 5s
retries: 3
start_period: 30s
networks:
- meldestelle-network
# --- CACHE ---
redis:
image: redis:7-alpine
container_name: meldestelle-redis
restart: unless-stopped
ports:
- "6379:6379"
volumes:
- redis-data:/data
command: redis-server --appendonly yes
healthcheck:
test: [ "CMD", "redis-cli" ]
interval: 1s
timeout: 5s
retries: 3
networks:
- meldestelle-network
# --- IDENTITY PROVIDER (Wartet auf Postgres) ---
keycloak:
image: quay.io/keycloak/keycloak:26.4
container_name: meldestelle-keycloak
restart: unless-stopped
environment:
KC_HEALTH_ENABLED: true
KC_METRICS_ENABLED: true
KC_BOOTSTRAP_ADMIN_USERNAME: kc-admin
KC_BOOTSTRAP_ADMIN_PASSWORD: kc-password
KC_DB: postgres
KC_DB_URL: jdbc:postgresql://postgres:5432/meldestelle
KC_DB_USERNAME: pg-user
KC_DB_PASSWORD: pg-password
KC_HOSTNAME: localhost
ports:
- "8180:8080"
depends_on:
postgres:
condition: service_healthy
volumes:
- ./docker/core/keycloak:/opt/keycloak/data/import:Z
command: start-dev --import-realm
healthcheck:
test: [ "CMD-SHELL", "exec 3<>/dev/tcp/127.0.0.1/9000" ]
interval: 20s
timeout: 10s
retries: 5
start_period: 60s
networks:
- meldestelle-network
# --- MONITORING ---
prometheus:
image: prom/prometheus:v2.54.1
container_name: meldestelle-prometheus
restart: unless-stopped
ports:
- "9090:9090"
volumes:
- prometheus-data:/prometheus
- ./docker/monitoring/prometheus:/etc/prometheus:Z
command:
- --config.file=/etc/prometheus/prometheus.yaml
- --storage.tsdb.retention.time=15d
healthcheck:
test: [ "CMD", "wget", "--spider", "-q", "http://localhost:9090/-/healthy" ]
interval: 30s
timeout: 10s
retries: 3
start_period: 30s
networks:
- meldestelle-network
grafana:
image: grafana/grafana:11.3.0
container_name: meldestelle-grafana
environment:
GF_SECURITY_ADMIN_USER: gf-admin
GF_SECURITY_ADMIN_PASSWORD: gf-password
ports:
- "3000:3000"
volumes:
- grafana-data:/var/lib/grafana
- ./docker/monitoring/grafana:/etc/grafana/provisioning:Z
depends_on:
- prometheus
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3000/api/health" ]
interval: 30s
timeout: 10s
retries: 3
start_period: 30s
networks:
- meldestelle-network
volumes:
postgres-data:
pgadmin-data:
redis-data:
prometheus-data:
grafana-data:
networks:
meldestelle-network:
driver: bridge
-1
View File
@@ -1 +0,0 @@
services: {}
-1
View File
@@ -1 +0,0 @@
services: {}
-368
View File
@@ -1,368 +0,0 @@
name: "${PROJECT_NAME:-meldestelle}"
services:
# ==========================================
# CORE INFRASTRUCTURE
# ==========================================
# --- DATABASE: PostgreSQL ---
postgres:
image: "postgres:16-alpine"
container_name: "${PROJECT_NAME}-postgres"
restart: "${RESTART_POLICY}"
ports:
- "${POSTGRES_PORT}"
environment:
POSTGRES_USER: "${POSTGRES_USER}"
POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
POSTGRES_DB: "${POSTGRES_DB}"
volumes:
- "postgres-data:/var/lib/postgresql/data"
- "../config/backend/infrastructure/postgres:/docker-entrypoint-initdb.d:Z"
- "../config/backend/infrastructure/postgres/postgresql.conf:/etc/postgresql/postgresql.conf:Z"
command: [ "postgres", "-c", "config_file=/etc/postgresql/postgresql.conf" ]
healthcheck:
test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}" ]
interval: "5s"
timeout: "5s"
retries: "5"
start_period: "10s"
networks:
meldestelle-network:
aliases:
- "postgres"
# --- CACHE: Redis ---
redis:
image: "redis:8.4-alpine"
container_name: "${PROJECT_NAME}-redis"
restart: "${RESTART_POLICY}"
ports:
- "${REDIS_PORT}"
volumes:
- "redis-data:/data"
- "../config/backend/infrastructure/redis/redis.conf:/usr/local/etc/redis/redis.conf:Z"
command: [ "sh", "-lc", "exec redis-server /usr/local/etc/redis/redis.conf ${REDIS_PASSWORD:+--requirepass $REDIS_PASSWORD}" ]
healthcheck:
test: [ "CMD-SHELL", "redis-cli -a \"$REDIS_PASSWORD\" ping | grep PONG" ]
interval: "5s"
timeout: "5s"
retries: "3"
networks:
meldestelle-network:
aliases:
- "redis"
# --- IAM: Keycloak ---
keycloak:
image: "meldestelle-keycloak:latest"
container_name: "${PROJECT_NAME}-keycloak"
restart: "${RESTART_POLICY}"
build:
context: "../config/backend/infrastructure/keycloak"
args:
KEYCLOAK_IMAGE_TAG: "26.4"
environment:
# Admin Credentials aus .env
KC_BOOTSTRAP_ADMIN_USERNAME: "${KC_ADMIN_USER}"
KC_BOOTSTRAP_ADMIN_PASSWORD: "${KC_ADMIN_PASSWORD}"
# DB Verbindung (Nutzt interne Docker-Namen, daher fest 'postgres')
KC_DB: "postgres"
KC_DB_URL: "jdbc:postgresql://postgres:5432/pg-${PROJECT_NAME}-db"
KC_DB_USERNAME: "${POSTGRES_USER}"
KC_DB_PASSWORD: "${POSTGRES_PASSWORD}"
# Hostname & Proxy (Wichtig für Dev!)
KC_HOSTNAME: "localhost"
# Erlaubte Backend-Calls via http://keycloak:8080 im Docker Netzwerk
KC_HOSTNAME_STRICT: "false"
KC_HOSTNAME_STRICT_HTTPS: "false"
KC_HTTP_ENABLED: "true"
KC_PROXY_HEADERS: "xforwarded"
# Health & Metrics sind schon im Image gebaut, aber env schadet nicht
KC_HEALTH_ENABLED: "true"
KC_METRICS_ENABLED: "true"
ports:
- "${KC_PORT}"
- "9000:9000"
depends_on:
postgres:
condition: "service_healthy"
volumes:
# Import Realm
- "../config/backend/infrastructure/keycloak:/opt/keycloak/data/import:Z"
command: "start --optimized --import-realm"
healthcheck:
test: [ "CMD-SHELL", "exec 3<>/dev/tcp/127.0.0.1/9000" ]
interval: "10s"
timeout: "5s"
retries: "5"
start_period: "60s"
networks:
meldestelle-network:
aliases:
- "keycloak"
# --- DATENBANK-MANAGEMENT-TOOL: pgAdmin4 ---
pgadmin:
image: "dpage/pgadmin4:8"
container_name: "${PROJECT_NAME}-pgadmin"
restart: "${RESTART_POLICY}"
ports:
- "${PGADMIN_PORT:-8888:80}"
environment:
PGADMIN_DEFAULT_EMAIL: "${PGADMIN_EMAIL}"
PGADMIN_DEFAULT_PASSWORD: "${PGADMIN_PASSWORD}"
volumes:
- "pgadmin-data:/var/lib/pgadmin"
networks:
meldestelle-network:
aliases:
- "pgadmin"
# --- MONITORING: Prometheus ---
prometheus:
image: "prom/prometheus:v3.7.3"
container_name: "${PROJECT_NAME}-prometheus"
restart: "${RESTART_POLICY}"
ports:
- "${PROMETHEUS_PORT}"
volumes:
- "prometheus-data:/prometheus"
- "../config/backend/infrastructure/monitoring/prometheus:/etc/prometheus:Z"
command:
- --web.enable-lifecycle
- --config.file=/etc/prometheus/prometheus.yaml
- --storage.tsdb.retention.time=15d
healthcheck:
test: [ "CMD", "wget", "--spider", "-q", "http://localhost:9090/-/healthy" ]
interval: "30s"
timeout: "10s"
retries: "3"
start_period: "30s"
networks:
meldestelle-network:
aliases:
- "prometheus"
# --- MONITORING: Grafana ---
grafana:
image: grafana/grafana:12.3
container_name: ${PROJECT_NAME}-grafana
restart: "${RESTART_POLICY}"
environment:
GF_SECURITY_ADMIN_USER: ${GF_ADMIN_USER}
GF_SECURITY_ADMIN_PASSWORD: ${GF_ADMIN_PASSWORD}
ports:
- "${GF_PORT}"
volumes:
- grafana-data:/var/lib/grafana
# Provisioning (datasources/dashboards) from central config
- ../config/backend/infrastructure/monitoring/grafana/provisioning:/etc/grafana/provisioning:Z
# Dashboards directory (referenced by provisioning file path: /var/lib/grafana/dashboards)
- ../config/backend/infrastructure/monitoring/grafana/dashboards:/var/lib/grafana/dashboards:Z
depends_on:
- prometheus
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:3000/api/health" ]
interval: 30s
timeout: 10s
retries: 3
start_period: 30s
networks:
meldestelle-network:
aliases:
- grafana
# --- CONSUL ---
consul:
image: "hashicorp/consul:1.22.1"
container_name: "${PROJECT_NAME}-consul"
restart: "${RESTART_POLICY}"
ports:
- "${CONSUL_PORT}"
- "${CONSUL_UDP_PORT}"
command: "agent -server -bootstrap-expect=1 -ui -client=0.0.0.0"
healthcheck:
test: [ "CMD", "curl", "-f", "http://localhost:8500/v1/status/leader" ]
interval: "30s"
timeout: "10s"
retries: "3"
networks:
meldestelle-network:
aliases:
- "consul"
# --- API-GATEWAY: Spring Cloud Gateway ---
api-gateway:
build:
context: ..
dockerfile: backend/infrastructure/gateway/Dockerfile
args:
# Build-Args aus deinen .env Dateien (werden hier statisch benötigt für den Build)
GRADLE_VERSION: "9.1.0"
JAVA_VERSION: "21"
VERSION: "1.0.0-SNAPSHOT"
BUILD_DATE: "2025-12-04"
container_name: "${PROJECT_NAME}-gateway"
restart: "${RESTART_POLICY}"
ports:
- "${GATEWAY_SERVER_PORT}"
- "${GATEWAY_DEBUG_PORT}"
environment:
# server.port must be an integer. Do not pass host:container mapping here.
SERVER_PORT: "8081"
SPRING_PROFILES_ACTIVE: "docker"
DEBUG: "true"
# --- KEYCLOAK ---
# Container-zu-Container Kommunikation (intern)
SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_ISSUER_URI: "http://keycloak:8080/realms/meldestelle"
# JWK Set Uri erzwingen, damit er nicht über den Issuer (localhost vs keycloak) stolpert
SPRING_SECURITY_OAUTH2_RESOURCESERVER_JWT_JWK_SET_URI: "http://keycloak:8080/realms/meldestelle/protocol/openid-connect/certs"
# --- CONSUL ---
SPRING_CLOUD_CONSUL_HOST: "consul"
# Consul port must be an integer (container internal port)
SPRING_CLOUD_CONSUL_PORT: "8500"
# WICHTIG: Das Gateway muss wissen, wie es von anderen Containern erreicht wird (nicht localhost!)
SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME: "api-gateway"
# Wichtig für Docker: Wir wollen IP-Adressen registrieren, keine Hostnames, die DNS brauchen
SPRING_CLOUD_CONSUL_DISCOVERY_PREFER_IP_ADDRESS: "true"
# --- POSTGRES ---
SPRING_DATASOURCE_URL: "jdbc:postgresql://postgres:5432/${POSTGRES_DB}"
SPRING_DATASOURCE_USERNAME: "${POSTGRES_USER}"
SPRING_DATASOURCE_PASSWORD: "${POSTGRES_PASSWORD}"
# --- LOGGING ---
LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_GATEWAY: "DEBUG"
LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_SECURITY: "DEBUG"
depends_on:
consul:
condition: "service_healthy"
postgres:
condition: "service_healthy"
keycloak:
condition: "service_healthy"
networks:
meldestelle-network:
aliases:
- "api-gateway"
# ==========================================
# MICROSERVICES
# ==========================================
ping-service:
build:
context: ..
dockerfile: backend/services/ping/Dockerfile
args:
GRADLE_VERSION: 9.1.0
JAVA_VERSION: 21
VERSION: 1.0.0
BUILD_DATE: "2025-11-29"
container_name: ${PROJECT_NAME}-ping-service
restart: "${RESTART_POLICY}"
ports:
- "${PING_PORT}"
- "${PING_DEBUG_PORT}"
environment:
SPRING_PROFILES_ACTIVE: docker
DEBUG: "true"
SERVER_PORT: 8082
# --- CONSUL ---
SPRING_CLOUD_CONSUL_HOST: consul
SPRING_CLOUD_CONSUL_PORT: 8500
SPRING_CLOUD_CONSUL_DISCOVERY_HOSTNAME: ping-service
# - DATENBANK VERBINDUNG -
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB}
SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER}
SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD}
SPRING_JPA_HIBERNATE_DDL_AUTO: validate
# --- REDIS ---
SPRING_DATA_REDIS_HOST: redis
SPRING_DATA_REDIS_PORT: 6379
# Optional: if REDIS_PASSWORD is set in .env, forward it to Spring
SPRING_DATA_REDIS_PASSWORD: "${REDIS_PASSWORD}"
# Make initial connection a bit more tolerant on startup races
SPRING_DATA_REDIS_CONNECT_TIMEOUT: 5s
depends_on:
consul:
condition: service_healthy
postgres:
condition: service_healthy
keycloak:
condition: service_healthy
redis:
condition: service_healthy
networks:
meldestelle-network:
aliases:
- ping-service
# ==========================================
# FRONTEND
# ==========================================
# --- WEB-APP ---
web-app:
build:
context: ..
dockerfile: ../config/frontends/web-app/Dockerfile
args:
GRADLE_VERSION: ${DOCKER_GRADLE_VERSION:-9.1.0}
JAVA_VERSION: ${DOCKER_JAVA_VERSION:-21}
NODE_VERSION: ${DOCKER_NODE_VERSION:-22.21.0}
NGINX_IMAGE_TAG: ${DOCKER_NGINX_VERSION:-1.28.0-alpine}
WEB_BUILD_PROFILE: ${WEB_BUILD_PROFILE:-dev}
container_name: ${PROJECT_NAME}-web-app
restart: "${RESTART_POLICY}"
ports:
- "${WEB_APP_PORT}"
volumes:
# Mount production nginx config (can be adjusted per env)
- ../config/nginx/nginx.prod.conf:/etc/nginx/nginx.conf:Z,ro
depends_on:
api-gateway:
condition: service_started
networks:
meldestelle-network:
aliases:
- web-app
desktop-app:
build:
context: ..
dockerfile: ../config/frontends/desktop-app/Dockerfile
container_name: ${PROJECT_NAME}-desktop-app
restart: "${RESTART_POLICY}"
environment:
API_BASE_URL: http://api-gateway:8081
ports:
- "${DESKTOP_APP_VNC_PORT}"
- "${DESKTOP_APP_NOVNC_PORT}"
depends_on:
api-gateway:
condition: service_started
networks:
meldestelle-network:
aliases:
- desktop-app
volumes:
postgres-data:
pgadmin-data:
redis-data:
prometheus-data:
grafana-data:
networks:
meldestelle-network:
driver: bridge