fixing docker-compose and cleanup

docker/build-args/clients.env

@@ -0,0 +1,36 @@
+# ===================================================================
+# Clients Docker Build Arguments - dockerfiles/clients/*
+# Source: docker/versions.toml [categories.clients]
+# Last updated: 2025-09-13 12:51:22 UTC
+# ===================================================================
+
+# --- Include Global Arguments ---
+# Source global.env for GRADLE_VERSION, JAVA_VERSION, BUILD_DATE, VERSION
+
+# --- Client-Specific Build Tools ---
+NODE_VERSION=20.12.0
+NGINX_VERSION=1.25-alpine
+
+# --- Client Build Configuration ---
+CLIENT_PATH=client
+CLIENT_MODULE=client
+CLIENT_NAME=meldestelle-client
+
+# --- Web Application Specific ---
+WEB_APP_PORT=4000
+WEB_APP_BUILD_TARGET=wasmJsBrowserDistribution
+
+# --- Desktop Application Specific ---
+DESKTOP_APP_VNC_PORT=5901
+DESKTOP_APP_NOVNC_PORT=6080
+DESKTOP_APP_BUILD_TARGET=composeDesktop
+
+# --- Client Environment ---
+NODE_ENV=production
+APP_TITLE=Meldestelle
+APP_VERSION=1.0.0
+DOCKER_APP_VERSION
+
+# --- Development Configuration ---
+WEBPACK_DEV_SERVER_HOST=0.0.0.0
+WEBPACK_DEV_SERVER_PORT=4000

docker/build-args/global.env

@@ -0,0 +1,19 @@
+# ===================================================================
+# Global Docker Build Arguments - Used by all categories
+# Source: docker/versions.toml
+# Last updated: 2025-09-13 12:51:22 UTC
+# ===================================================================
+
+# --- Build Tools ---
+GRADLE_VERSION=9.0.0
+JAVA_VERSION=21
+
+# --- Build Metadata ---
+BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+VERSION=1.0.0
+DOCKER_APP_VERSION
+
+# --- Common Base Images ---
+ALPINE_VERSION=3.19
+ECLIPSE_TEMURIN_JDK_VERSION=21-jdk-alpine
+ECLIPSE_TEMURIN_JRE_VERSION=21-jre-alpine

docker/build-args/infrastructure.env

@@ -0,0 +1,39 @@
+# ===================================================================
+# Infrastructure Docker Build Arguments - dockerfiles/infrastructure/*
+# Source: docker/versions.toml [categories.infrastructure]
+# Last updated: 2025-09-13 12:51:22 UTC
+# ===================================================================
+
+# --- Include Global Arguments ---
+# Source global.env for GRADLE_VERSION, JAVA_VERSION, BUILD_DATE, VERSION
+
+# --- Infrastructure Services Configuration ---
+SPRING_PROFILES_ACTIVE=default
+DOCKER_SPRING_PROFILES_DEFAULT
+
+# --- Infrastructure Service Ports (matches gradle.properties) ---
+GATEWAY_PORT=8081
+AUTH_SERVER_PORT=8087
+MONITORING_SERVER_PORT=8088
+
+# --- API Gateway Specific ---
+GATEWAY_SERVICE_PATH=infrastructure/gateway
+GATEWAY_SERVICE_NAME=api-gateway
+
+# --- Auth Server Specific ---
+AUTH_SERVER_PATH=infrastructure/auth/auth-server
+AUTH_SERVER_SERVICE_NAME=auth-server
+
+# --- Monitoring Server Specific ---
+MONITORING_SERVER_PATH=infrastructure/monitoring/monitoring-server
+MONITORING_SERVER_SERVICE_NAME=monitoring-server
+
+# --- Infrastructure Dependencies ---
+CONSUL_ENABLED=true
+CONSUL_HOST=consul
+CONSUL_PORT=8500
+
+# --- Database Configuration for Infrastructure Services ---
+DB_HOST=postgres
+DB_PORT=5432
+DB_NAME=meldestelle

docker/build-args/services.env

@@ -0,0 +1,27 @@
+# ===================================================================
+# Services Docker Build Arguments - dockerfiles/services/*
+# Source: docker/versions.toml [categories.services]
+# Last updated: 2025-09-13 12:51:22 UTC
+# ===================================================================
+
+# --- Include Global Arguments ---
+# Source global.env for GRADLE_VERSION, JAVA_VERSION, BUILD_DATE, VERSION
+
+# --- Spring Boot Services Configuration ---
+SPRING_PROFILES_ACTIVE=docker
+DOCKER_SPRING_PROFILES_DOCKER
+
+# --- Service-Specific Arguments ---
+SERVICE_PATH=.
+SERVICE_NAME=spring-boot-service
+SERVICE_PORT=8080
+
+# --- Service Port Mapping (matches gradle.properties) ---
+PING_SERVICE_PORT=8082
+MEMBERS_SERVICE_PORT=8083
+HORSES_SERVICE_PORT=8084
+EVENTS_SERVICE_PORT=8085
+MASTERDATA_SERVICE_PORT=8086
+
+# --- Services List (for automation scripts) ---
+# ping-service, members-service, horses-service, events-service, masterdata-service

docker/versions.toml

@@ -0,0 +1,94 @@
+# ===================================================================
+# Docker Versions Catalog - Single Source of Truth
+# Analogous to gradle/libs.versions.toml for centralized version management
+# ===================================================================
+# Last updated: 2025-09-13
+# Eliminates version redundancy across 12+ Dockerfiles
+
+[versions]
+# --- Build Tools ---
+gradle = "9.0.0"
+java = "21"
+node = "20.12.0"
+
+# --- Base Images ---
+nginx = "1.25-alpine"
+alpine = "3.19"
+eclipse-temurin-jdk = "21-jdk-alpine"
+eclipse-temurin-jre = "21-jre-alpine"
+
+# --- Spring Configuration ---
+spring-profiles-default = "default"
+spring-profiles-docker = "docker"
+spring-profiles-prod = "prod"
+
+# --- Application Versions ---
+app-version = "1.0.0"
+
+[build-args]
+# --- Global Build Arguments (used across all categories) ---
+global = [
+    "GRADLE_VERSION",
+    "JAVA_VERSION",
+    "BUILD_DATE",
+    "VERSION"
+]
+
+# --- Spring Boot Services (dockerfiles/services/* and infrastructure/*) ---
+spring-services = [
+    "SPRING_PROFILES_ACTIVE",
+    "SERVICE_PATH",
+    "SERVICE_NAME",
+    "SERVICE_PORT"
+]
+
+# --- Kotlin/JS Web Clients (dockerfiles/clients/*) ---
+web-clients = [
+    "NODE_VERSION",
+    "NGINX_VERSION",
+    "CLIENT_PATH",
+    "CLIENT_MODULE",
+    "CLIENT_NAME"
+]
+
+[categories]
+# --- Services Configuration ---
+[categories.services]
+default-spring-profile = "docker"
+default-port-start = 8082
+services = [
+    "ping-service",
+    "members-service",
+    "horses-service",
+    "events-service",
+    "masterdata-service"
+]
+
+# --- Infrastructure Configuration ---
+[categories.infrastructure]
+default-spring-profile = "default"
+services = [
+    "gateway",
+    "auth-server",
+    "monitoring-server"
+]
+
+# --- Client Applications Configuration ---
+[categories.clients]
+default-node-version = "20.11.0"
+default-nginx-version = "1.25-alpine"
+clients = [
+    "web-app",
+    "desktop-app"
+]
+
+[environment-mapping]
+# --- Environment Variable Names for Docker Compose ---
+# Maps internal version names to environment variable names
+gradle-version = "DOCKER_GRADLE_VERSION"
+java-version = "DOCKER_JAVA_VERSION"
+node-version = "DOCKER_NODE_VERSION"
+nginx-version = "DOCKER_NGINX_VERSION"
+spring-profiles-default = "DOCKER_SPRING_PROFILES_DEFAULT"
+spring-profiles-docker = "DOCKER_SPRING_PROFILES_DOCKER"
+app-version = "DOCKER_APP_VERSION"