Remove outdated BillingController implementation, resolve conflicting bean definitions across modules, and retain the updated BillingController for consistency with frontend API logic.

backend/services/entries/Dockerfile

@@ -1,23 +1,30 @@
 # ===================================================================
 # Multi-stage Dockerfile for Meldestelle Entries Service
+# Features: Security hardening, monitoring support, optimal caching, BuildKit cache mounts
+# Version: 2.6.0 - Reliable Monorepo Build
 # ===================================================================
 
 # === CENTRALIZED BUILD ARGUMENTS ===
-ARG GRADLE_VERSION
-ARG JAVA_VERSION
+ARG GRADLE_VERSION=9.4.1
+ARG JAVA_VERSION=25
 ARG BUILD_DATE
-ARG VERSION
+ARG VERSION=1.0.0-SNAPSHOT
 
-FROM gradle:${GRADLE_VERSION}-jdk${JAVA_VERSION}-alpine AS builder
+# ===================================================================
+# Build Stage
+# ===================================================================
+FROM eclipse-temurin:${JAVA_VERSION}-jdk-alpine AS builder
+
+ARG VERSION
+ARG BUILD_DATE
 
 LABEL stage=builder \
-      service=entries-service \
-      maintainer="Meldestelle Development Team" \
-      version="${VERSION}" \
-      build.date="${BUILD_DATE}"
+      service="entries-service" \
+      maintainer="Meldestelle Development Team"
 
 WORKDIR /workspace
 
+# Gradle optimizations
 ENV GRADLE_OPTS="-Dorg.gradle.caching=true \
                  -Dorg.gradle.daemon=false \
                  -Dorg.gradle.parallel=true \
@@ -25,33 +32,26 @@ ENV GRADLE_OPTS="-Dorg.gradle.caching=true \
                  -Dorg.gradle.jvmargs=-Xmx2g \
                  -XX:+UseParallelGC \
                  -XX:MaxMetaspaceSize=512m"
+ENV GRADLE_USER_HOME=/root/.gradle
 
-ENV GRADLE_USER_HOME=/home/gradle/.gradle
+# 1. Copy full project structure for a reliable monorepo build
+# .dockerignore should be used to exclude unnecessary files (IDE, logs, etc.)
+COPY . .
 
-COPY gradlew gradlew.bat gradle.properties settings.gradle.kts ./
-COPY gradle/ gradle/
 RUN chmod +x gradlew
-COPY platform/ platform/
-COPY frontend/ frontend/
-COPY core/ core/
-COPY backend/ backend/
-COPY docs/ docs/
-COPY entries-service/build.gradle.kts ./
 
-# Copy entries modules
-COPY backend/services/entries/entries-api/ backend/services/entries/entries-api/
-COPY backend/services/entries/entries-service/ backend/services/entries/entries-service/
-
-RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
-    --mount=type=cache,target=/home/gradle/.gradle/wrapper \
-    ./gradlew :backend:services:entries:entries-service:dependencies --no-daemon --info
-
-RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
-    --mount=type=cache,target=/home/gradle/.gradle/wrapper \
+# 2. Build the service
+RUN --mount=type=cache,target=/root/.gradle/caches \
+    --mount=type=cache,target=/root/.gradle/wrapper \
     ./gradlew :backend:services:entries:entries-service:bootJar --no-daemon --info
 
+# 3. Extract layers
+WORKDIR /builder
+RUN cp /workspace/backend/services/entries/entries-service/build/libs/*.jar app.jar && \
+    java -Djarmode=layertools -jar app.jar extract
+
 # ===================================================================
-# Runtime stage
+# Runtime Stage
 # ===================================================================
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine AS runtime
 
@@ -59,10 +59,6 @@ ARG BUILD_DATE
 ARG VERSION
 ARG JAVA_VERSION
 
-ENV JAVA_VERSION=${JAVA_VERSION} \
-    VERSION=${VERSION} \
-    BUILD_DATE=${BUILD_DATE}
-
 LABEL service="entries-service" \
       version="${VERSION}" \
       description="Microservice for Entries Management" \
@@ -80,15 +76,17 @@ WORKDIR /app
 RUN apk update && \
     apk upgrade && \
     apk add --no-cache curl tzdata tini && \
-    rm -rf /var/cache/apk/* && \
-    addgroup -g ${APP_GID} -S ${APP_GROUP} && \
+    rm -rf /var/cache/apk/* &&     addgroup -g ${APP_GID} -S ${APP_GROUP} && \
     adduser -u ${APP_UID} -S ${APP_USER} -G ${APP_GROUP} -h /app -s /bin/sh && \
     mkdir -p /app/logs /app/tmp /app/config && \
     chown -R ${APP_USER}:${APP_GROUP} /app && \
     chmod -R 750 /app
 
-COPY --from=builder --chown=${APP_USER}:${APP_GROUP} \
-     /workspace/backend/services/entries/entries-service/build/libs/*.jar app.jar
+# Copy Spring Boot layers
+COPY --from=builder --chown=${APP_USER}:${APP_GROUP} /builder/dependencies/ ./
+COPY --from=builder --chown=${APP_USER}:${APP_GROUP} /builder/spring-boot-loader/ ./
+COPY --from=builder --chown=${APP_USER}:${APP_GROUP} /builder/snapshot-dependencies/ ./
+COPY --from=builder --chown=${APP_USER}:${APP_GROUP} /builder/application/ ./
 
 USER ${APP_USER}
 
@@ -115,17 +113,15 @@ ENV JAVA_OPTS="-XX:MaxRAMPercentage=75.0 \
     -Dmanagement.endpoint.health.show-details=always \
     -Dmanagement.prometheus.metrics.export.enabled=true"
 
-ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
-ENV SERVER_PORT=8083
-ENV LOGGING_LEVEL_ROOT=INFO
+ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
+    SERVER_PORT=8083 \
+    LOGGING_LEVEL_ROOT=INFO
 
 ENTRYPOINT ["tini", "--", "sh", "-c", "\
     echo 'Starting Entries Service with Java ${JAVA_VERSION}...'; \
-    echo 'Service port: ${SERVER_PORT}'; \
     if [ \"${DEBUG:-false}\" = \"true\" ]; then \
         echo 'DEBUG mode enabled'; \
-        exec java ${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar app.jar; \
+        exec java ${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 org.springframework.boot.loader.launch.JarLauncher; \
     else \
-        echo 'Starting Entries Service in production mode'; \
-        exec java ${JAVA_OPTS} -jar app.jar; \
+        exec java ${JAVA_OPTS} org.springframework.boot.loader.launch.JarLauncher; \
     fi"]