refactoring

2025-09-14 19:47:08 +02:00
parent 143ac7ba3e
commit f256d42d97
15 changed files with 1305 additions and 384 deletions
@@ -42,7 +42,7 @@ services:
    networks:
      - meldestelle-network
    healthcheck:
-      test: ["CMD", "curl", "--fail", "http://localhost:${PING_SERVICE_PORT:-8082}/actuator/health"]
+      test: [ "CMD", "curl", "--fail", "http://localhost:${PING_SERVICE_PORT:-8082}/actuator/health" ]
      interval: 15s
      timeout: 5s
      retries: 3
@@ -52,134 +52,134 @@ services:
  # ===================================================================
  # Members Service
  # ===================================================================
-#  members-service:
-#    build:
-#      context: .
-#      dockerfile: dockerfiles/services/members-service/Dockerfile
-#    container_name: meldestelle-members-service
-#    environment:
-#      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev}
-#      SERVER_PORT: ${MEMBERS_SERVICE_PORT:-8083}
-#      CONSUL_HOST: consul
-#      CONSUL_PORT: ${CONSUL_PORT:-8500}
-#      CONSUL_ENABLED: ${CONSUL_ENABLED:-true}
-#      DB_HOST: postgres
-#      DB_PORT: 5432
-#      DB_NAME: ${POSTGRES_DB:-meldestelle}
-#      DB_USER: ${POSTGRES_USER:-meldestelle}
-#      DB_PASSWORD: ${POSTGRES_PASSWORD:-meldestelle}
-#      REDIS_EVENT_STORE_HOST: redis
-#      REDIS_EVENT_STORE_PORT: 6379
-#      REDIS_EVENT_STORE_PASSWORD: ${REDIS_PASSWORD:-}
-#      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
-#    ports:
-#      - "${MEMBERS_SERVICE_PORT:-8083}:${MEMBERS_SERVICE_PORT:-8083}"
-#    depends_on:
-#      consul:
-#        condition: service_healthy
-#      postgres:
-#        condition: service_healthy
-#      redis:
-#        condition: service_healthy
-#      kafka:
-#        condition: service_healthy
-#    networks:
-#      - meldestelle-network
-#    healthcheck:
-#      test: ["CMD", "curl", "--fail", "http://localhost:${MEMBERS_SERVICE_PORT:-8083}/actuator/health"]
-#      interval: 15s
-#      timeout: 5s
-#      retries: 3
-#      start_period: 30s
-#    restart: unless-stopped
+  #  members-service:
+  #    build:
+  #      context: .
+  #      dockerfile: dockerfiles/services/members-service/Dockerfile
+  #    container_name: meldestelle-members-service
+  #    environment:
+  #      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev}
+  #      SERVER_PORT: ${MEMBERS_SERVICE_PORT:-8083}
+  #      CONSUL_HOST: consul
+  #      CONSUL_PORT: ${CONSUL_PORT:-8500}
+  #      CONSUL_ENABLED: ${CONSUL_ENABLED:-true}
+  #      DB_HOST: postgres
+  #      DB_PORT: 5432
+  #      DB_NAME: ${POSTGRES_DB:-meldestelle}
+  #      DB_USER: ${POSTGRES_USER:-meldestelle}
+  #      DB_PASSWORD: ${POSTGRES_PASSWORD:-meldestelle}
+  #      REDIS_EVENT_STORE_HOST: redis
+  #      REDIS_EVENT_STORE_PORT: 6379
+  #      REDIS_EVENT_STORE_PASSWORD: ${REDIS_PASSWORD:-}
+  #      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
+  #    ports:
+  #      - "${MEMBERS_SERVICE_PORT:-8083}:${MEMBERS_SERVICE_PORT:-8083}"
+  #    depends_on:
+  #      consul:
+  #        condition: service_healthy
+  #      postgres:
+  #        condition: service_healthy
+  #      redis:
+  #        condition: service_healthy
+  #      kafka:
+  #        condition: service_healthy
+  #    networks:
+  #      - meldestelle-network
+  #    healthcheck:
+  #      test: ["CMD", "curl", "--fail", "http://localhost:${MEMBERS_SERVICE_PORT:-8083}/actuator/health"]
+  #      interval: 15s
+  #      timeout: 5s
+  #      retries: 3
+  #      start_period: 30s
+  #    restart: unless-stopped

  # ===================================================================
  # Horses Service
  # ===================================================================
-#  horses-service:
-#    build:
-#      context: .
-#      dockerfile: dockerfiles/services/horses-service/Dockerfile
-#    container_name: meldestelle-horses-service
-#    environment:
-#      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev}
-#      SERVER_PORT: ${HORSES_SERVICE_PORT:-8084}
-#      CONSUL_HOST: consul
-#      CONSUL_PORT: ${CONSUL_PORT:-8500}
-#      CONSUL_ENABLED: ${CONSUL_ENABLED:-true}
-#      DB_HOST: postgres
-#      DB_PORT: 5432
-#      DB_NAME: ${POSTGRES_DB:-meldestelle}
-#      DB_USER: ${POSTGRES_USER:-meldestelle}
-#      DB_PASSWORD: ${POSTGRES_PASSWORD:-meldestelle}
-#      REDIS_EVENT_STORE_HOST: redis
-#      REDIS_EVENT_STORE_PORT: 6379
-#      REDIS_EVENT_STORE_PASSWORD: ${REDIS_PASSWORD:-}
-#      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
-#    ports:
-#      - "${HORSES_SERVICE_PORT:-8084}:${HORSES_SERVICE_PORT:-8084}"
-#    depends_on:
-#      consul:
-#        condition: service_healthy
-#      postgres:
-#        condition: service_healthy
-#      redis:
-#        condition: service_healthy
-#      kafka:
-#        condition: service_healthy
-#    networks:
-#      - meldestelle-network
-#    healthcheck:
-#      test: ["CMD", "curl", "--fail", "http://localhost:${HORSES_SERVICE_PORT:-8084}/actuator/health"]
-#      interval: 15s
-#      timeout: 5s
-#      retries: 3
-#      start_period: 30s
-#    restart: unless-stopped
+  #  horses-service:
+  #    build:
+  #      context: .
+  #      dockerfile: dockerfiles/services/horses-service/Dockerfile
+  #    container_name: meldestelle-horses-service
+  #    environment:
+  #      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev}
+  #      SERVER_PORT: ${HORSES_SERVICE_PORT:-8084}
+  #      CONSUL_HOST: consul
+  #      CONSUL_PORT: ${CONSUL_PORT:-8500}
+  #      CONSUL_ENABLED: ${CONSUL_ENABLED:-true}
+  #      DB_HOST: postgres
+  #      DB_PORT: 5432
+  #      DB_NAME: ${POSTGRES_DB:-meldestelle}
+  #      DB_USER: ${POSTGRES_USER:-meldestelle}
+  #      DB_PASSWORD: ${POSTGRES_PASSWORD:-meldestelle}
+  #      REDIS_EVENT_STORE_HOST: redis
+  #      REDIS_EVENT_STORE_PORT: 6379
+  #      REDIS_EVENT_STORE_PASSWORD: ${REDIS_PASSWORD:-}
+  #      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
+  #    ports:
+  #      - "${HORSES_SERVICE_PORT:-8084}:${HORSES_SERVICE_PORT:-8084}"
+  #    depends_on:
+  #      consul:
+  #        condition: service_healthy
+  #      postgres:
+  #        condition: service_healthy
+  #      redis:
+  #        condition: service_healthy
+  #      kafka:
+  #        condition: service_healthy
+  #    networks:
+  #      - meldestelle-network
+  #    healthcheck:
+  #      test: ["CMD", "curl", "--fail", "http://localhost:${HORSES_SERVICE_PORT:-8084}/actuator/health"]
+  #      interval: 15s
+  #      timeout: 5s
+  #      retries: 3
+  #      start_period: 30s
+  #    restart: unless-stopped

  # ===================================================================
  # Events Service
  # ===================================================================
-#  events-service:
-#    build:
-#      context: .
-#      dockerfile: dockerfiles/services/events-service/Dockerfile
-#    container_name: meldestelle-events-service
-#    environment:
-#      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev}
-#      SERVER_PORT: ${EVENTS_SERVICE_PORT:-8085}
-#      CONSUL_HOST: consul
-#      CONSUL_PORT: ${CONSUL_PORT:-8500}
-#      CONSUL_ENABLED: ${CONSUL_ENABLED:-true}
-#      DB_HOST: postgres
-#      DB_PORT: 5432
-#      DB_NAME: ${POSTGRES_DB:-meldestelle}
-#      DB_USER: ${POSTGRES_USER:-meldestelle}
-#      DB_PASSWORD: ${POSTGRES_PASSWORD:-meldestelle}
-#      REDIS_EVENT_STORE_HOST: redis
-#      REDIS_EVENT_STORE_PORT: 6379
-#      REDIS_EVENT_STORE_PASSWORD: ${REDIS_PASSWORD:-}
-#      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
-#    ports:
-#      - "${EVENTS_SERVICE_PORT:-8085}:${EVENTS_SERVICE_PORT:-8085}"
-#    depends_on:
-#      consul:
-#        condition: service_healthy
-#      postgres:
-#        condition: service_healthy
-#      redis:
-#        condition: service_healthy
-#      kafka:
-#        condition: service_healthy
-#    networks:
-#      - meldestelle-network
-#    healthcheck:
-#      test: ["CMD", "curl", "--fail", "http://localhost:${EVENTS_SERVICE_PORT:-8085}/actuator/health"]
-#      interval: 15s
-#      timeout: 5s
-#      retries: 3
-#      start_period: 30s
-#    restart: unless-stopped
+  #  events-service:
+  #    build:
+  #      context: .
+  #      dockerfile: dockerfiles/services/events-service/Dockerfile
+  #    container_name: meldestelle-events-service
+  #    environment:
+  #      SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-dev}
+  #      SERVER_PORT: ${EVENTS_SERVICE_PORT:-8085}
+  #      CONSUL_HOST: consul
+  #      CONSUL_PORT: ${CONSUL_PORT:-8500}
+  #      CONSUL_ENABLED: ${CONSUL_ENABLED:-true}
+  #      DB_HOST: postgres
+  #      DB_PORT: 5432
+  #      DB_NAME: ${POSTGRES_DB:-meldestelle}
+  #      DB_USER: ${POSTGRES_USER:-meldestelle}
+  #      DB_PASSWORD: ${POSTGRES_PASSWORD:-meldestelle}
+  #      REDIS_EVENT_STORE_HOST: redis
+  #      REDIS_EVENT_STORE_PORT: 6379
+  #      REDIS_EVENT_STORE_PASSWORD: ${REDIS_PASSWORD:-}
+  #      KAFKA_BOOTSTRAP_SERVERS: kafka:29092
+  #    ports:
+  #      - "${EVENTS_SERVICE_PORT:-8085}:${EVENTS_SERVICE_PORT:-8085}"
+  #    depends_on:
+  #      consul:
+  #        condition: service_healthy
+  #      postgres:
+  #        condition: service_healthy
+  #      redis:
+  #        condition: service_healthy
+  #      kafka:
+  #        condition: service_healthy
+  #    networks:
+  #      - meldestelle-network
+  #    healthcheck:
+  #      test: ["CMD", "curl", "--fail", "http://localhost:${EVENTS_SERVICE_PORT:-8085}/actuator/health"]
+  #      interval: 15s
+  #      timeout: 5s
+  #      retries: 3
+  #      start_period: 30s
+  #    restart: unless-stopped

  # ===================================================================
  # Masterdata Service
@@ -225,6 +225,13 @@ services:
 #      start_period: 30s
 #    restart: unless-stopped

+# ===================================================================
+# Volumes
+# ===================================================================
+volumes:
+  ping-service-gradle-cache:
+    driver: local
+
 # ===================================================================
 # Networks (shared network from main compose file)
 # ===================================================================