3f9326a533
* fix(infra): Makefile .env generiert * MP-18 Env-Konfiguration Refactoring: Schritte 2–4 umgesetzt\n\n2) Single Source of Truth für Versionen\n- docker/versions.toml als alleinige Quelle bestätigt\n- docker/build-args/global.env bereinigt und konsistent auf *_IMAGE_TAG umgestellt (PROMETHEUS_IMAGE_TAG, GRAFANA_IMAGE_TAG, KEYCLOAK_IMAGE_TAG, POSTGRES_IMAGE_TAG, REDIS_IMAGE_TAG, CONSUL_IMAGE_TAG, KAFKA_IMAGE_TAG, ZOOKEEPER_IMAGE_TAG)\n- Keine Ports/Profiles/Secrets in global.env\n\n3) Build vs. Laufzeit getrennt (Variablenbereinigung)\n- .env.template von allen Build-/Image-Versionen befreit (DOCKER_*_VERSION, (DOCKER_)APP_VERSION, BUILD_DATE)\n- App-Versionsvariable vereinheitlicht: Nutzung von VERSION (APP_VERSION in Build-Args entfernt)\n\n4) Laufzeit-Env konsolidiert (globales .env)\n- Zentrales config/env/.env erstellt (Ports, Hosts, Flags, Pfade, SPRING_PROFILES_ACTIVE, NODE_ENV etc.)\n- config/env/.env.local angelegt (gitignored) und .gitignore ergänzt\n- Laufzeitwerte aus Build-Args-Dateien (clients/infrastructure/services) entfernt bzw. kommentiert mit Verweis auf config/env/.env\n\nAkzeptanzkriterien erfüllt\n- global.env enthält ausschließlich Build-Versionen/-Tags und Build-Tool-Versionen\n- .env.template enthält keine Build-/Image-Versionen mehr\n- Zentrales config/env/.env ist die einzige Quelle für Laufzeitwerte\n\nYouTrack: https://meldestelle-pro.youtrack.cloud/issue/MP-18 * MP-18 Env-Konfiguration Refactoring: Schritte 5–7 umgesetzt 5) Build-Args-Dateien entschlackt/umstrukturiert - clients.env: Laufzeitwerte entfernt, NODE_VERSION/NGINX_VERSION → NODE_IMAGE_TAG/NGINX_IMAGE_TAG; nur Build-relevante Pfade/Namen belassen - infrastructure.env/services.env: bereits zuvor Runtime-Variablen entfernt, Kommentare mit Verweis auf config/env/.env beibehalten 6) Dockerfiles überprüft/angepasst - clients/web-app: Build-ARGs eingeführt (GRADLE_VERSION, JAVA_VERSION, NGINX_IMAGE_TAG), Basis-Image aus Tag abgeleitet; keine Runtime-ARGs - services/ping-service: SPRING_PROFILES_ACTIVE als ARG entfernt; Build ruft ohne -P profile; Labels/ENV vereinheitlicht (OCI: version/created) - infrastructure/gateway: SPRING_PROFILES_ACTIVE als ARG entfernt; Build ohne -P; Labels vereinheitlicht - templates/spring-boot-service.Dockerfile: Runtime-ARGs (SPRING_PROFILES_ACTIVE, SERVICE_PORT) entfernt; Healthcheck/Expose auf ENV basierend; ENV getrennt gesetzt - infrastructure/monitoring-server: SPRING_PROFILES_ACTIVE-ARG entfernt; Build ohne -P; ENV/Labels bereinigt 7) docker-compose* bereinigt - docker-compose.yml: env_file: config/env/.env hinzugefügt; Image-Tags von DOCKER_* auf feste Versionen (aus global.env/versions.toml) umgestellt; keine Laufzeitwerte via build.args - docker-compose.services.yml: env_file hinzugefügt; DOCKER_* Build-Args entfernt; nur Build-Zeit-ARGs (GRADLE_VERSION, JAVA_VERSION, BUILD_DATE, VERSION); Ports/ENV aus config/env/.env - docker-compose.clients.yml: env_file hinzugefügt; DOCKER_* entfernt; NGINX_IMAGE_TAG als Build-Arg; APP_VERSION nutzt VERSION Akzeptanzkriterien - Keine Laufzeitvariablen in build-args-Dateien - Dockerfiles verwenden ausschließlich Build-ARGs; keine Ports/Secrets/Profile als ARG - Compose lädt nur eine Runtime-Env-Quelle (config/env/.env) und schleust keine Runtimewerte via build.args ein YouTrack: https://meldestelle-pro.youtrack.cloud/issue/MP-18 * MP-18 Env-Konfiguration Refactoring: Schritte 8–11 umgesetzt 8) Secrets-Strategie (Dev vereinfacht) - config/env/.env.local bereits vorhanden und gitignored; Nutzung für lokale Secrets verdeutlicht - docker/secrets/README.md hinzugefügt; echte Geheimnisse entfernt/Platzhalter gesetzt (postgres_password.txt) - Optimierte Compose-Dateien erzwingen Secrets nur im Profil 'prod' (profiles: [prod]) und verwenden env_file: config/env/.env 9) Namenskonventionen vereinheitlicht - DOCKER_* in optimierten Compose-Dateien entfernt; Build-Args auf GRADLE_VERSION/JAVA_VERSION/VERSION und *_IMAGE_TAG konsolidiert - SPRING_PROFILES_ACTIVE nur noch zur Laufzeit (Compose/env); aus Dockerfiles (auth, gateway, horses, events, members, masterdata) als Build-ARG entfernt 10) CI: ssot-guard.yml erweitert - Guard-Checks hinzugefügt: Fail bei Runtime-Variablen in Build-Args-Dateien und bei Build-/Versions-Variablen in Runtime-Envs - Konsistenz-Check zwischen docker/versions.toml und docker/build-args/global.env (zentraler Versionsabgleich) 11) Skripte & Automatisierung - Neues Skript scripts/generate-build-env.sh zum Generieren von docker/build-args/global.env aus docker/versions.toml (minimal) Akzeptanzkriterien - Lokale Entwicklung erfordert keine Docker-Secrets (Compose default), keine Geheimnisse im Repo - Keine DOCKER_* Präfixe in Laufzeitdateien, eindeutige Namenskonventionen - CI bricht bei Build-vs-Runtime-Verletzungen und Versions-Drift YouTrack: https://meldestelle-pro.youtrack.cloud/issue/MP-18 * MP-18 Env-Konfiguration Refactoring: Schritte 12–17 umgesetzt 12) DDD-Slice-Overrides eingeführt - Optionale Runtime-Env-Dateien hinzugefügt: config/env/services/{ping,members,horses,events,masterdata}.env, config/env/infrastructure/api-gateway.env, config/env/clients/web-app.env - Compose-Dateien laden diese Overrides zusätzlich zu config/env/.env (nur wenn vorhanden) 13) Deduplizierung bestätigt - Build-Args-Dateien enthalten keine Laufzeitwerte; .env/.env.template ohne Build-/Versions-Keys 14) Compose an Envs gekoppelt - docker-compose*.yml referenzieren ausschließlich config/env/.env + optionale Slice-Overrides; keine docker/build-args/*.env als Runtime-Quelle 15) Doku aktualisiert - README: neue Konfig-Struktur, Quickstart mit .env/.env.local, optionale Overrides, Deprecations (DOCKER_*_VERSION → *_IMAGE_TAG), Smoke-Tests 16) Cleanup & Deprecations - Deprecation-Hinweise in README dokumentiert; keine obsoleten Root-.env-Dateien verbleiben 17) Validierung & Hinweise - Start-/Healthcheck-Hinweise für lokalen Smoke-Test ergänzt; CI-Guards bleiben gültig * MP-18 DoD-Finalisierung: Build/Runtime-Trennung verhärtet, Doku-Hinweise korrigiert - Entfernt: Runtime-Build-ARG SERVICE_PORT aus Service-Dockerfiles (members, horses, events, masterdata) * Feste Default-Ports gesetzt (8083–8086), Healthchecks und SERVER_PORT-ENV angepasst * Erfüllt DoD: Build-Args enthalten keine Runtime-Werte mehr - .env.template Usage korrigiert: verweist nun explizit auf config/env/.env und compose-Aufrufe DoD-Checkliste: ✓ Zentrale Runtime-Datei config/env/.env + .env.local (Compose nutzt env_file) ✓ Build-Args nur Versionen/Pfade/Namen (keine Runtime-Keys) ✓ versions.toml als einzige Quelle für Image-/Tool-Versionen (CI-Guard prüft Drift) ✓ CI-Workflow blockiert Build/Runtime-Mixing & Versions-Drift (ssot-guard) ✓ README dokumentiert den Flow (Quickstart, Struktur, Deprecations) ✓ Clean Builds/Local-Starts durch compose-Files unterstützt YouTrack: https://meldestelle-pro.youtrack.cloud/issue/MP-18 * MP-18: GitHub-Workflows aktualisiert und README Markdownlint-Fehler behoben Workflows - CI: minimale Permissions + Concurrency hinzugefügt; build-test hängt jetzt auch von validate-docs ab; actions/setup-node → v4 - SSoT Guard: minimale Permissions + Concurrency - Deploy Proxmox: Concurrency; Deploy-Job läuft korrekt bei workflow_dispatch (zuvor durch falsche IF-Bedingung blockiert) - Docs KDoc Sync: minimale Permissions + Concurrency - Integration Tests: minimale Permissions + Concurrency - YouTrack Sync: minimale Permissions + Concurrency; Guard, wenn Secrets fehlen Docs - README.md: MD032 (Leerzeilen um Listen) korrigiert - README.md: MD037 (Spaces in Emphasis / Wildcards) durch Backticks behoben - README.md: MD034 (Bare URLs) via <> eingefasst Ziel - Optimierte, aktuelle CI-Workflows und grüne markdownlint-Prüfungen. YouTrack: https://meldestelle-pro.youtrack.cloud/issue/MP-18 * MP-18: Fix Docker SSoT validator errors Remove default values from centralized ARGs in web-app Dockerfile (GRADLE_VERSION, JAVA_VERSION, NGINX_IMAGE_TAG). Align build.args in compose files to centralized DOCKER_* vars from versions.toml mapping (clients/services/optimized), and update api-gateway in optimized compose. Replace hardcoded infra image tags in docker-compose.yml with DOCKER_* fallbacks for postgres/redis/prometheus/grafana/keycloak. Validated via scripts/validate-docker-consistency.sh all → Errors=0 (Warnings remain by design). YouTrack: https://meldestelle-pro.youtrack.cloud/issue/MP-18 * MP-18: Finalize Env/SSoT refactor – align generator, validator, build-args and compose - Switch docker/build-args/global.env to *_IMAGE_TAG keys (PROMETHEUS/GRAFANA/KEYCLOAK/POSTGRES/REDIS/CONSUL/KAFKA/ZOOKEEPER) - Clean docker/build-args/{clients,services,infrastructure}.env to build-time only; remove runtime/profile/ports - Update scripts/docker-versions-update.sh to emit *_IMAGE_TAG and strip runtime keys from build-args files - Update scripts/validate-docker-consistency.sh to check *_IMAGE_TAG and stop enforcing runtime keys in build-args - Rename Keycloak Dockerfile ARG to KEYCLOAK_IMAGE_TAG and update FROM/labels - Add build arg fallbacks in compose files where needed (GRADLE/JAVA/VERSION) for dev convenience Result: - scripts/validate-docker-consistency.sh all → 0 errors (warnings remain informational) YouTrack: https://meldestelle-pro.youtrack.cloud/issue/MP-18 * fix: Bash-Syntax-Fehler in ssot-guard.yml behoben - Fehlerhafte '2>/dev/null || true' Konstrukte in for-Schleifen entfernt - Stattdessen 'shopt -s nullglob' für saubere Behandlung nicht-existierender Dateimuster verwendet - Beide betroffene for-Schleifen (Runtime-Variablen und Build-Variablen Guards) korrigiert MP-18 * chore: Regenerate Docker Compose files to fix SSoT drift - Removed default values from build arguments (now using centralized DOCKER_* variables) - Removed env_file directives for cleaner configuration - Updated variable names for consistency (GATEWAY_PORT → API_GATEWAY_PORT) - Standardized comments and structure across all compose files Resolves SSoT drift detected by ssot-guard workflow. MP-18 * MP-18 fix: Bash-Syntax-Fehler in ssot-guard.yml behoben - Fehlerhafte '2>/dev/null || true' Konstrukte in for-Schleifen entfernt - Stattdessen 'shopt -s nullglob' für saubere Behandlung nicht-existierender Dateimuster verwendet - Beide betroffene for-Schleifen (Runtime-Variablen und Build-Variablen Guards) korrigiert * MP-18 chore: Regenerate Docker Compose files to fix SSoT drift - Removed default values from build arguments (now using centralized DOCKER_* variables) - Removed env_file directives for cleaner configuration - Updated variable names for consistency (GATEWAY_PORT → API_GATEWAY_PORT) - Standardized comments and structure across all compose files Resolves SSoT drift detected by ssot-guard workflow. * MP-18 fix: qodana_code_quality.yml qodana.yaml * fix: GitHub Actions Workflow-Fehler behoben - youtrack-sync.yml: Korrektur der secrets if-Bedingung (Line 18) * Entfernung ungültiger != '' Vergleiche * Verwendung korrekter GitHub Actions Syntax: secrets.YT_URL && secrets.YT_TOKEN - ssot-guard.yml: Korrektur der get_toml_ver() Funktion * Behebung des Versions-Drift Problems * Parsing nur aus [versions] Sektion mit State-Machine-Pattern * Korrekte Extraktion aller 11 Versionswerte aus versions.toml * Trimming von Spaces vor Key-Vergleich Fixes: MP-18 * MP-18 Entfernung von Qodana * MP-18 fix(ssot-guard): align build-args comments with generator output to remove SSoT drift - clients.env/services.env/infrastructure.env: update runtime note text to match scripts/docker-versions-update.sh - Avoids false-positive drift in workflow (content changes beyond ignored timestamps) * MP-18 fix: workflows/youtrack-sync.yml * MP-18 fix: workflows/youtrack-sync.yml * MP-18 fix: workflows/youtrack-sync.yml * MP-18 fix: workflows/youtrack-sync.yml * MP-18 fix: workflows/youtrack-sync.yml
368 lines
12 KiB
Plaintext
368 lines
12 KiB
Plaintext
# ===================================================================
|
|
# Docker Compose - Client Applications (OPTIMIZED & SECURED)
|
|
# Meldestelle Project - Frontend Components
|
|
# ===================================================================
|
|
# Security & Performance Improvements:
|
|
# - Resource limits and reservations for all clients
|
|
# - Security hardening (non-root users, no-new-privileges)
|
|
# - Optimized build configurations and caching
|
|
# - Enhanced health checks and monitoring
|
|
# - Production-ready configurations
|
|
# ===================================================================
|
|
# Usage Scenarios:
|
|
#
|
|
# 1. STANDALONE CLIENT DEPLOYMENT:
|
|
# docker-compose -f docker-compose.clients.yml.optimized up -d
|
|
# - Clients run independently without api-gateway dependency
|
|
# - Set GATEWAY_HOST environment variable to external API Gateway
|
|
#
|
|
# 2. MULTI-FILE WITH INFRASTRUCTURE:
|
|
# docker-compose -f docker-compose.yml.optimized -f docker-compose.clients.yml.optimized up -d
|
|
# - Infrastructure services start first, then clients connect
|
|
#
|
|
# 3. COMPLETE SYSTEM:
|
|
# docker-compose -f docker-compose.yml.optimized -f docker-compose.services.yml.optimized -f docker-compose.clients.yml.optimized up -d
|
|
# - Full stack deployment with all components
|
|
# ===================================================================
|
|
|
|
version: '3.9'
|
|
|
|
services:
|
|
# ===================================================================
|
|
# Web Application - Kotlin/JS + Nginx with Security Hardening
|
|
# ===================================================================
|
|
web-app:
|
|
build:
|
|
context: .
|
|
dockerfile: dockerfiles/clients/web-app/Dockerfile
|
|
args:
|
|
# Global build arguments (build-time only)
|
|
GRADLE_VERSION: ${DOCKER_GRADLE_VERSION}
|
|
JAVA_VERSION: ${DOCKER_JAVA_VERSION}
|
|
BUILD_DATE: ${BUILD_DATE:-unknown}
|
|
VERSION: ${DOCKER_APP_VERSION:-1.0.0}
|
|
# Client-specific image tag (build-time only)
|
|
NGINX_IMAGE_TAG: ${DOCKER_NGINX_VERSION:-1.28.0-alpine}
|
|
# Application-specific arguments
|
|
CLIENT_PATH: client
|
|
CLIENT_MODULE: client
|
|
CLIENT_NAME: meldestelle-web-app
|
|
container_name: meldestelle-web-app
|
|
env_file:
|
|
- config/env/.env
|
|
# Optional client-specific overrides (only if file exists)
|
|
- config/env/clients/web-app.env
|
|
environment:
|
|
NODE_ENV: ${NODE_ENV:-production}
|
|
APP_TITLE: ${APP_NAME:-Meldestelle}
|
|
APP_VERSION: ${VERSION:-1.0.0}
|
|
# API Gateway Configuration
|
|
API_BASE_URL: http://${GATEWAY_HOST:-api-gateway}:${GATEWAY_PORT:-8081}
|
|
# Nginx Worker Processes (for Performance)
|
|
NGINX_WORKER_PROCESSES: ${NGINX_WORKER_PROCESSES:-auto}
|
|
NGINX_WORKER_CONNECTIONS: ${NGINX_WORKER_CONNECTIONS:-1024}
|
|
# Security Headers
|
|
NGINX_SECURITY_HEADERS: "true"
|
|
ports:
|
|
- "${WEB_APP_PORT:-4000}:4000"
|
|
networks:
|
|
- meldestelle-network
|
|
volumes:
|
|
# Nginx cache directory
|
|
- web-app-cache:/var/cache/nginx
|
|
# Temp directory with proper permissions
|
|
- web-app-tmp:/tmp/nginx
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
cpus: '1.0'
|
|
memory: 512M
|
|
reservations:
|
|
cpus: '0.25'
|
|
memory: 128M
|
|
healthcheck:
|
|
test: ["CMD", "curl", "--fail", "--max-time", "5", "http://localhost:4000/health"]
|
|
interval: 30s
|
|
timeout: 10s
|
|
retries: 3
|
|
start_period: 60s
|
|
restart: unless-stopped
|
|
security_opt:
|
|
- no-new-privileges:true
|
|
# Run as nginx user (built into nginx image)
|
|
user: "101:101" # nginx:nginx
|
|
labels:
|
|
- "traefik.enable=true"
|
|
- "traefik.http.routers.web-app.rule=Host(`${WEB_APP_DOMAIN:-localhost}`) && PathPrefix(`/`)"
|
|
- "traefik.http.services.web-app.loadbalancer.server.port=4000"
|
|
- "traefik.http.routers.web-app.tls=true"
|
|
|
|
# ===================================================================
|
|
# Desktop Application - Kotlin Desktop + VNC with Security
|
|
# ===================================================================
|
|
desktop-app:
|
|
build:
|
|
context: .
|
|
dockerfile: dockerfiles/clients/desktop-app/Dockerfile
|
|
args:
|
|
- BUILD_DATE=${BUILD_DATE:-$(date -u +"%Y-%m-%dT%H:%M:%SZ")}
|
|
- VERSION=${VERSION:-1.0.0}
|
|
container_name: meldestelle-desktop-app
|
|
env_file:
|
|
- config/env/.env
|
|
environment:
|
|
# API Configuration - fallback to external gateway if not in same compose network
|
|
API_BASE_URL: http://${GATEWAY_HOST:-api-gateway}:${GATEWAY_PORT:-8081}
|
|
# VNC Configuration with Security
|
|
DISPLAY: ":99"
|
|
VNC_PORT: "5901"
|
|
NOVNC_PORT: "6080"
|
|
VNC_PASSWORD_FILE: /run/secrets/vnc_password
|
|
# App Information
|
|
APP_TITLE: ${APP_NAME:-Meldestelle}
|
|
APP_VERSION: ${APP_VERSION:-1.0.0}
|
|
# JVM Settings for Desktop App
|
|
JAVA_OPTS: "-Xmx1g -Xms256m -XX:+UseG1GC -XX:MaxGCPauseMillis=200"
|
|
ports:
|
|
- "${DESKTOP_VNC_WEB_PORT:-6080}:6080" # Web-based VNC (noVNC)
|
|
- "${DESKTOP_VNC_PORT:-5901}:5901" # VNC direct access
|
|
volumes:
|
|
# Desktop app data directory
|
|
- desktop-app-data:/app/data
|
|
# X11 socket for display
|
|
- /tmp/.X11-unix:/tmp/.X11-unix:rw
|
|
networks:
|
|
- meldestelle-network
|
|
secrets:
|
|
- vnc_password
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
cpus: '2.0'
|
|
memory: 2G
|
|
reservations:
|
|
cpus: '0.5'
|
|
memory: 512M
|
|
healthcheck:
|
|
test: ["CMD", "/opt/health-check.sh"]
|
|
interval: 30s
|
|
timeout: 10s
|
|
retries: 3
|
|
start_period: 90s
|
|
restart: unless-stopped
|
|
security_opt:
|
|
- no-new-privileges:true
|
|
labels:
|
|
- "traefik.enable=true"
|
|
- "traefik.http.routers.desktop-app.rule=Host(`${DESKTOP_APP_DOMAIN:-localhost}`) && PathPrefix(`/desktop`)"
|
|
- "traefik.http.services.desktop-app.loadbalancer.server.port=6080"
|
|
- "traefik.http.routers.desktop-app.tls=true"
|
|
profiles:
|
|
- desktop
|
|
|
|
# ===================================================================
|
|
# Auth Server - Custom Authentication Service (Enhanced Security)
|
|
# ===================================================================
|
|
auth-server:
|
|
build:
|
|
context: .
|
|
dockerfile: dockerfiles/infrastructure/auth-server/Dockerfile
|
|
args:
|
|
# Global build arguments
|
|
GRADLE_VERSION: ${DOCKER_GRADLE_VERSION}
|
|
JAVA_VERSION: ${DOCKER_JAVA_VERSION:-21}
|
|
BUILD_DATE: ${BUILD_DATE:-unknown}
|
|
VERSION: ${DOCKER_APP_VERSION:-1.0.0}
|
|
# Infrastructure-specific arguments
|
|
SPRING_PROFILES_ACTIVE: ${DOCKER_SPRING_PROFILES_DEFAULT:-default}
|
|
container_name: meldestelle-auth-server
|
|
volumes:
|
|
- auth-server-gradle-cache:/home/gradle/.gradle
|
|
environment:
|
|
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-docker}
|
|
SERVER_PORT: ${AUTH_SERVICE_PORT:-8087}
|
|
# Keycloak Integration
|
|
KEYCLOAK_SERVER_URL: http://keycloak:8080
|
|
KEYCLOAK_REALM: meldestelle
|
|
KEYCLOAK_CLIENT_ID: meldestelle-auth-service
|
|
KEYCLOAK_CLIENT_SECRET_FILE: /run/secrets/keycloak_auth_client_secret
|
|
# Database connection via secrets
|
|
DB_HOST: postgres
|
|
DB_PORT: 5432
|
|
DB_NAME: ${POSTGRES_DB:-meldestelle}
|
|
DB_USERNAME_FILE: /run/secrets/postgres_user
|
|
DB_PASSWORD_FILE: /run/secrets/postgres_password
|
|
# JWT Configuration via secrets
|
|
JWT_SECRET_FILE: /run/secrets/jwt_secret
|
|
JWT_ISSUER: ${JWT_ISSUER:-meldestelle-auth-server}
|
|
JWT_AUDIENCE: ${JWT_AUDIENCE:-meldestelle-services}
|
|
ports:
|
|
- "${AUTH_SERVICE_PORT:-8087}:8087"
|
|
depends_on:
|
|
postgres:
|
|
condition: service_healthy
|
|
keycloak:
|
|
condition: service_started
|
|
networks:
|
|
- meldestelle-network
|
|
secrets:
|
|
- postgres_user
|
|
- postgres_password
|
|
- jwt_secret
|
|
- keycloak_auth_client_secret
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
cpus: '1.5'
|
|
memory: 1.5G
|
|
reservations:
|
|
cpus: '0.5'
|
|
memory: 512M
|
|
healthcheck:
|
|
test: ["CMD", "curl", "--fail", "--max-time", "10", "http://localhost:8087/actuator/health/readiness"]
|
|
interval: 30s
|
|
timeout: 15s
|
|
retries: 3
|
|
start_period: 90s
|
|
restart: unless-stopped
|
|
security_opt:
|
|
- no-new-privileges:true
|
|
profiles:
|
|
- auth
|
|
|
|
# ===================================================================
|
|
# Monitoring Server - Custom Grafana Extensions (Enhanced Security)
|
|
# ===================================================================
|
|
monitoring-server:
|
|
build:
|
|
context: .
|
|
dockerfile: dockerfiles/infrastructure/monitoring-server/Dockerfile
|
|
args:
|
|
# Global build arguments
|
|
GRADLE_VERSION: ${DOCKER_GRADLE_VERSION}
|
|
JAVA_VERSION: ${DOCKER_JAVA_VERSION:-21}
|
|
BUILD_DATE: ${BUILD_DATE:-unknown}
|
|
VERSION: ${DOCKER_APP_VERSION:-1.0.0}
|
|
# Infrastructure-specific arguments
|
|
SPRING_PROFILES_ACTIVE: ${DOCKER_SPRING_PROFILES_DEFAULT:-default}
|
|
container_name: meldestelle-monitoring-server
|
|
volumes:
|
|
- monitoring-server-gradle-cache:/home/gradle/.gradle
|
|
- monitoring-data:/app/data
|
|
- ./docker/monitoring:/app/config:ro
|
|
environment:
|
|
SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-docker}
|
|
SERVER_PORT: 8088
|
|
# Monitoring Services URLs
|
|
GRAFANA_URL: http://grafana:3000
|
|
PROMETHEUS_URL: http://prometheus:9090
|
|
# Authentication via secrets
|
|
GRAFANA_ADMIN_USER_FILE: /run/secrets/grafana_admin_user
|
|
GRAFANA_ADMIN_PASSWORD_FILE: /run/secrets/grafana_admin_password
|
|
METRICS_AUTH_USERNAME_FILE: /run/secrets/metrics_auth_username
|
|
METRICS_AUTH_PASSWORD_FILE: /run/secrets/metrics_auth_password
|
|
ports:
|
|
- "${MONITORING_SERVER_PORT:-8088}:8088"
|
|
depends_on:
|
|
grafana:
|
|
condition: service_healthy
|
|
prometheus:
|
|
condition: service_healthy
|
|
networks:
|
|
- meldestelle-network
|
|
secrets:
|
|
- grafana_admin_user
|
|
- grafana_admin_password
|
|
- metrics_auth_username
|
|
- metrics_auth_password
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
cpus: '1.0'
|
|
memory: 1G
|
|
reservations:
|
|
cpus: '0.25'
|
|
memory: 256M
|
|
healthcheck:
|
|
test: ["CMD", "curl", "--fail", "--max-time", "10", "http://localhost:8088/actuator/health/readiness"]
|
|
interval: 30s
|
|
timeout: 15s
|
|
retries: 3
|
|
start_period: 90s
|
|
restart: unless-stopped
|
|
security_opt:
|
|
- no-new-privileges:true
|
|
profiles:
|
|
- monitoring
|
|
|
|
# ===================================================================
|
|
# Secrets - Client-specific and Shared
|
|
# ===================================================================
|
|
secrets:
|
|
# Shared secrets (external references to main infrastructure secrets)
|
|
postgres_user:
|
|
external: true
|
|
name: meldestelle_postgres_user
|
|
postgres_password:
|
|
external: true
|
|
name: meldestelle_postgres_password
|
|
grafana_admin_user:
|
|
external: true
|
|
name: meldestelle_grafana_admin_user
|
|
grafana_admin_password:
|
|
external: true
|
|
name: meldestelle_grafana_admin_password
|
|
|
|
# Client-specific secrets
|
|
jwt_secret:
|
|
external: true
|
|
name: meldestelle_jwt_secret
|
|
vnc_password:
|
|
file: ./docker/secrets/vnc_password.txt
|
|
keycloak_auth_client_secret:
|
|
file: ./docker/secrets/keycloak_auth_client_secret.txt
|
|
metrics_auth_username:
|
|
file: ./docker/secrets/metrics_auth_username.txt
|
|
metrics_auth_password:
|
|
file: ./docker/secrets/metrics_auth_password.txt
|
|
|
|
# ===================================================================
|
|
# Volumes - Client-specific Data and Caches
|
|
# ===================================================================
|
|
volumes:
|
|
# Web App volumes
|
|
web-app-cache:
|
|
driver: local
|
|
web-app-tmp:
|
|
driver: local
|
|
|
|
# Desktop App volumes
|
|
desktop-app-data:
|
|
driver: local
|
|
driver_opts:
|
|
type: none
|
|
o: bind
|
|
device: ${DATA_PATH:-./data}/desktop-app
|
|
|
|
# Build cache volumes
|
|
auth-server-gradle-cache:
|
|
driver: local
|
|
monitoring-server-gradle-cache:
|
|
driver: local
|
|
|
|
# Monitoring data (shared with main infrastructure)
|
|
monitoring-data:
|
|
driver: local
|
|
driver_opts:
|
|
type: none
|
|
o: bind
|
|
device: ${DATA_PATH:-./data}/monitoring
|
|
|
|
# ===================================================================
|
|
# Networks - Use external network from main infrastructure
|
|
# ===================================================================
|
|
networks:
|
|
meldestelle-network:
|
|
external: true
|
|
name: meldestelle_meldestelle-network
|