Remove obsolete commented-out microservices from dc-backend.yaml

dc-backend.yaml

@@ -148,145 +148,6 @@ services:
     volumes:
       - ./config/app/base-application.yaml:/workspace/config/application.yml:Z
 
-  # --- MICROSERVICE: Entries Service (ON HOLD) ---
-  # Currently disabled in docker-compose but present in build
-#  entries-service:
-#    build:
-#      context: .
-#      dockerfile: backend/services/entries/Dockerfile
-#      args:
-#        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
-#        JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
-#        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: 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}"
-#
-#      # --- ZIPKIN ---
-#      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "${ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}"
-#      MANAGEMENT_TRACING_SAMPLING_PROBABILITY: "${ZIPKIN_SAMPLING_PROBABILITY:-1.0}"
-#
-#    depends_on:
-#      postgres:
-#        condition: "service_healthy"
-#      consul:
-#        condition: "service_healthy"
-#      zipkin:
-#        condition: "service_started"
-#    networks:
-#      meldestelle-network:
-#        aliases:
-#          - "entries-service"
-#    profiles: [ "backend", "all" ]
-#    volumes:
-#      - ./config/app/base-application.yaml:/workspace/config/application.yml:Z
-#
-#  # --- MICROSERVICE: Results Service ---
-#  results-service:
-#    build:
-#      context: .
-#      dockerfile: backend/services/results/results-service/Dockerfile
-#      args:
-#        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
-#        JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
-#        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: 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}"
-#
-#      # --- ZIPKIN ---
-#      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "${ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}"
-#      MANAGEMENT_TRACING_SAMPLING_PROBABILITY: "${ZIPKIN_SAMPLING_PROBABILITY:-1.0}"
-#
-#    depends_on:
-#      postgres:
-#        condition: "service_healthy"
-#      consul:
-#        condition: "service_healthy"
-#      zipkin:
-#        condition: "service_started"
-#    networks:
-#      meldestelle-network:
-#        aliases:
-#          - "results-service"
-#    profiles: [ "backend", "all" ]
-#    volumes:
-#      - ./config/app/base-application.yaml:/workspace/config/application.yml:Z
-#
-#  # --- MICROSERVICE: Scheduling Service ---
-#  scheduling-service:
-#    build:
-#      context: .
-#      dockerfile: backend/services/scheduling/scheduling-service/Dockerfile
-#      args:
-#        GRADLE_VERSION: "${DOCKER_GRADLE_VERSION:-9.3.1}"
-#        JAVA_VERSION: "${DOCKER_JAVA_VERSION:-25}"
-#        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: 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}"
-#
-#      # --- ZIPKIN ---
-#      MANAGEMENT_ZIPKIN_TRACING_ENDPOINT: "${ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}"
-#      MANAGEMENT_TRACING_SAMPLING_PROBABILITY: "${ZIPKIN_SAMPLING_PROBABILITY:-1.0}"
-#
-#    depends_on:
-#      postgres:
-#        condition: "service_healthy"
-#      consul:
-#        condition: "service_healthy"
-#      zipkin:
-#        condition: "service_started"
-#    networks:
-#      meldestelle-network:
-#        aliases:
-#          - "scheduling-service"
-#    profiles: [ "backend", "all" ]
-#    volumes:
-#      - ./config/app/base-application.yaml:/workspace/config/application.yml:Z
-
 networks:
   meldestelle-network:
     driver: bridge

dc-gui.yaml

@@ -36,31 +36,6 @@ services:
           - "web-app"
     profiles: [ "gui", "all" ]
 
-  # --- DESKTOP-APP (optional) ---
-#  desktop-app:
-#    build:
-#      context: .
-#      dockerfile: config/docker/nginx/desktop-app/Dockerfile
-#      args:
-#        BUILD_DATE: "${DOCKER_BUILD_DATE}"
-#    labels:
-#      - "org.opencontainers.image.created=${DOCKER_BUILD_DATE}"
-#    container_name: "${PROJECT_NAME:-meldestelle}-desktop-app"
-#    restart: no
-#    environment:
-#      API_BASE_URL: "http://api-gateway:8081"
-#    ports:
-#      - "${DESKTOP_APP_VNC_PORT:-5901:5901}"
-#      - "${DESKTOP_APP_NOVNC_PORT:-6080:6080}"
-#    depends_on:
-#      api-gateway:
-#        condition: "service_started"
-#    networks:
-#      meldestelle-network:
-#        aliases:
-#          - "desktop-app"
-#    profiles: [ "gui", "all" ]
-
 networks:
   meldestelle-network:
     driver: bridge

docker-compose.yaml

@@ -15,9 +15,7 @@ networks:
 volumes:
   postgres-data:
   pgadmin-data:
-  redis-data:
+  valkey-data:
   prometheus-data:
   grafana-data:
   mailpit-data:
-
-#  valkey-data