From 67d5de76088af957f68c90658367340576f24d17 Mon Sep 17 00:00:00 2001 From: StefanMoCoAt Date: Sat, 6 Dec 2025 23:39:11 +0100 Subject: [PATCH] =?UTF-8?q?MP-27=20Epic=207:=20Backend=E2=80=91Konsolidier?= =?UTF-8?q?ung=20=E2=80=93=20Services=20&=20Gateway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yaml | 105 ++++++++++++++++++++++++++++++++++++++++++++ settings.gradle.kts | 9 ++++ 2 files changed, 114 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index ec7f7244..03a1af15 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -352,6 +352,111 @@ services: aliases: - "ping-service" + entries-service: + build: + context: . + dockerfile: backend/services/entries/entries-service/Dockerfile + args: + GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.1.0}" + JAVA_VERSION: "${DOCKER_JAVA_VERSION:-21}" + VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}" + BUILD_DATE: "${DOCKER_BUILD_DATE}" + labels: + - "org.opencontainers.image.created=${DOCKER_BUILD_DATE}" + container_name: "${PROJECT_NAME:-meldestelle}-entries-service" + restart: "${RESTART_POLICY:-no}" + ports: + - "8083:8083" + environment: + SERVER_PORT: "8083" + SPRING_PROFILES_ACTIVE: "${SPRING_PROFILES_ACTIVE:-docker}" + SPRING_CLOUD_CONSUL_HOST: "${CONSUL_HOST:-consul}" + SPRING_CLOUD_CONSUL_PORT: "${CONSUL_HTTP_PORT:-8500}" + SPRING_CLOUD_CONSUL_DISCOVERY_SERVICE_NAME: "entries-service" + SPRING_CLOUD_CONSUL_DISCOVERY_PREFER_IP_ADDRESS: "true" + SPRING_DATASOURCE_URL: "${POSTGRES_DB_URL:-jdbc:postgresql://postgres:5432/pg-meldestelle-db}" + SPRING_DATASOURCE_USERNAME: "${POSTGRES_USER:-pg-user}" + SPRING_DATASOURCE_PASSWORD: "${POSTGRES_PASSWORD:-pg-password}" + depends_on: + postgres: + condition: "service_healthy" + consul: + condition: "service_healthy" + networks: + meldestelle-network: + aliases: + - "entries-service" + + results-service: + build: + context: . + dockerfile: backend/services/results/results-service/Dockerfile + args: + GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.1.0}" + JAVA_VERSION: "${DOCKER_JAVA_VERSION:-21}" + VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}" + BUILD_DATE: "${DOCKER_BUILD_DATE}" + labels: + - "org.opencontainers.image.created=${DOCKER_BUILD_DATE}" + container_name: "${PROJECT_NAME:-meldestelle}-results-service" + restart: "${RESTART_POLICY:-no}" + ports: + - "8084:8084" + environment: + SERVER_PORT: "8084" + SPRING_PROFILES_ACTIVE: "${SPRING_PROFILES_ACTIVE:-docker}" + SPRING_CLOUD_CONSUL_HOST: "${CONSUL_HOST:-consul}" + SPRING_CLOUD_CONSUL_PORT: "${CONSUL_HTTP_PORT:-8500}" + SPRING_CLOUD_CONSUL_DISCOVERY_SERVICE_NAME: "results-service" + SPRING_CLOUD_CONSUL_DISCOVERY_PREFER_IP_ADDRESS: "true" + SPRING_DATASOURCE_URL: "${POSTGRES_DB_URL:-jdbc:postgresql://postgres:5432/pg-meldestelle-db}" + SPRING_DATASOURCE_USERNAME: "${POSTGRES_USER:-pg-user}" + SPRING_DATASOURCE_PASSWORD: "${POSTGRES_PASSWORD:-pg-password}" + depends_on: + postgres: + condition: "service_healthy" + consul: + condition: "service_healthy" + networks: + meldestelle-network: + aliases: + - "results-service" + + scheduling-service: + build: + context: . + dockerfile: backend/services/scheduling/scheduling-service/Dockerfile + args: + GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.1.0}" + JAVA_VERSION: "${DOCKER_JAVA_VERSION:-21}" + VERSION: "${DOCKER_VERSION:-1.0.0-SNAPSHOT}" + BUILD_DATE: "${DOCKER_BUILD_DATE}" + labels: + - "org.opencontainers.image.created=${DOCKER_BUILD_DATE}" + container_name: "${PROJECT_NAME:-meldestelle}-scheduling-service" + restart: "${RESTART_POLICY:-no}" + ports: + - "8085:8085" + environment: + SERVER_PORT: "8085" + SPRING_PROFILES_ACTIVE: "${SPRING_PROFILES_ACTIVE:-docker}" + SPRING_CLOUD_CONSUL_HOST: "${CONSUL_HOST:-consul}" + SPRING_CLOUD_CONSUL_PORT: "${CONSUL_HTTP_PORT:-8500}" + SPRING_CLOUD_CONSUL_DISCOVERY_SERVICE_NAME: "scheduling-service" + SPRING_CLOUD_CONSUL_DISCOVERY_PREFER_IP_ADDRESS: "true" + SPRING_DATASOURCE_URL: "${POSTGRES_DB_URL:-jdbc:postgresql://postgres:5432/pg-meldestelle-db}" + SPRING_DATASOURCE_USERNAME: "${POSTGRES_USER:-pg-user}" + SPRING_DATASOURCE_PASSWORD: "${POSTGRES_PASSWORD:-pg-password}" + depends_on: + postgres: + condition: "service_healthy" + consul: + condition: "service_healthy" + networks: + meldestelle-network: + aliases: + - "scheduling-service" + # ========================================== # FRONTEND # ========================================== diff --git a/settings.gradle.kts b/settings.gradle.kts index f42ebaad..c6476627 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -64,6 +64,15 @@ include(":backend:infrastructure:monitoring:monitoring-server") // include(":backend:services:events:events-infrastructure") // include(":backend:services:events:events-service") +// --- ENTRIES (Nennungen) --- +include(":backend:services:entries:entries-service") + +// --- RESULTS (Ergebnisse) --- +include(":backend:services:results:results-service") + +// --- SCHEDULING (Zeitplan/Abteilungen) --- +include(":backend:services:scheduling:scheduling-service") + // --- HORSES (Horse Management) --- // include(":backend:services:horses:horses-api") // include(":backend:services:horses:horses-common")