ein wenig aufgeräumt

dockerfiles/services/ping-service/Dockerfile

@@ -1,22 +1,27 @@
-# syntax=docker/dockerfile:1.8
+# syntax=docker/dockerfile:1.7
 
 # ===================================================================
 # Optimized Dockerfile for Spring Boot Ping Service
 # Features: Multi-stage build, security hardening, monitoring support, enhanced caching
+# Version: 2.0.0 - Enhanced optimization and security
 # ===================================================================
 
 # Build arguments for flexibility
 ARG GRADLE_VERSION=8.14
 ARG JAVA_VERSION=21
 ARG SPRING_PROFILES_ACTIVE=default
+ARG BUILD_DATE
+ARG VERSION=1.0.0
 
 # Build stage: compile the ping-service JAR inside Docker
 FROM gradle:${GRADLE_VERSION}-jdk${JAVA_VERSION}-alpine AS builder
 
 # Add metadata labels
-LABEL stage=builder
-LABEL service=ping-service
-LABEL maintainer="Meldestelle Development Team"
+LABEL stage=builder \
+      service=ping-service \
+      maintainer="Meldestelle Development Team" \
+      version="${VERSION}" \
+      build.date="${BUILD_DATE}"
 
 WORKDIR /workspace
 
@@ -25,7 +30,13 @@ ENV GRADLE_OPTS="-Dorg.gradle.caching=true \
                  -Dorg.gradle.daemon=false \
                  -Dorg.gradle.parallel=true \
                  -Dorg.gradle.configureondemand=true \
-                 -Xmx2g"
+                 -Dorg.gradle.workers.max=2 \
+                 -Dorg.gradle.jvmargs=-Xmx1536m \
+                 -XX:+UseParallelGC \
+                 -XX:MaxMetaspaceSize=512m"
+
+# Set Gradle user home for better caching
+ENV GRADLE_USER_HOME=/home/gradle/.gradle
 
 # Copy gradle wrapper and configuration files first for optimal caching
 COPY gradlew gradlew.bat gradle.properties settings.gradle.kts ./
@@ -34,6 +45,18 @@ COPY gradle/ gradle/
 # Copy platform dependencies (changes less frequently)
 COPY platform/ platform/
 
+# Copy client directories (required by settings.gradle.kts)
+COPY client/ client/
+
+# Copy core directories (required by settings.gradle.kts)
+COPY core/ core/
+
+# Copy infrastructure directories (required by settings.gradle.kts)
+COPY infrastructure/ infrastructure/
+
+# Copy docs directory (required by settings.gradle.kts)
+COPY docs/ docs/
+
 # Copy root build configuration
 COPY build.gradle.kts ./
 
@@ -59,16 +82,22 @@ FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine AS runtime
 
 # Build arguments for runtime stage
 ARG BUILD_DATE
+ARG VERSION=1.0.0
+ARG JAVA_VERSION=21
 ARG SPRING_PROFILES_ACTIVE=default
 
 # Add comprehensive metadata
 LABEL service="ping-service" \
-      version="1.0.0" \
+      version="${VERSION}" \
       description="Microservice demonstrating circuit breaker patterns and monitoring" \
       maintainer="Meldestelle Development Team" \
       java.version="${JAVA_VERSION}" \
       spring.profiles.active="${SPRING_PROFILES_ACTIVE}" \
-      build.date="${BUILD_DATE}"
+      build.date="${BUILD_DATE}" \
+      org.opencontainers.image.title="Ping Service" \
+      org.opencontainers.image.description="Spring Boot microservice with circuit breaker patterns" \
+      org.opencontainers.image.version="${VERSION}" \
+      org.opencontainers.image.created="${BUILD_DATE}"
 
 # Build arguments for runtime configuration
 ARG APP_USER=appuser
@@ -79,17 +108,19 @@ ARG APP_GID=1001
 # Set working directory
 WORKDIR /app
 
-# Update Alpine packages, install tools, create user and directories in one layer
+# Enhanced Alpine setup with security hardening
 RUN apk update && \
     apk upgrade && \
     apk add --no-cache \
         curl \
-        tzdata && \
+        tzdata \
+        tini && \
     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 && \
-    chown -R ${APP_USER}:${APP_GROUP} /app
+    mkdir -p /app/logs /app/tmp /app/config && \
+    chown -R ${APP_USER}:${APP_GROUP} /app && \
+    chmod -R 750 /app
 
 # Copy the built JAR from builder stage with proper ownership
 COPY --from=builder --chown=${APP_USER}:${APP_GROUP} \
@@ -105,15 +136,23 @@ EXPOSE 8082 5005
 HEALTHCHECK --interval=15s --timeout=3s --start-period=40s --retries=3 \
     CMD curl -fsS --max-time 2 http://localhost:8082/actuator/health/readiness || exit 1
 
-# Optimized JVM settings for Spring Boot 3.x with Java 21 and monitoring support
-ENV JAVA_OPTS="-XX:MaxRAMPercentage=80.0 \
+# Optimized JVM settings for Java 21 with enhanced container support
+ENV JAVA_OPTS="-XX:MaxRAMPercentage=75.0 \
     -XX:+UseG1GC \
     -XX:+UseStringDeduplication \
     -XX:+UseContainerSupport \
+    -XX:G1HeapRegionSize=16m \
+    -XX:G1ReservePercent=25 \
+    -XX:InitiatingHeapOccupancyPercent=30 \
+    -XX:+UnlockExperimentalVMOptions \
+    -XX:+UseTransparentHugePages \
+    -XX:+AlwaysPreTouch \
+    -XX:+DisableExplicitGC \
     -Djava.security.egd=file:/dev/./urandom \
     -Djava.awt.headless=true \
     -Dfile.encoding=UTF-8 \
     -Duser.timezone=Europe/Vienna \
+    -Dspring.backgroundpreinitializer.ignore=true \
     -Dmanagement.endpoints.web.exposure.include=health,info,metrics,prometheus \
     -Dmanagement.endpoint.health.show-details=always \
     -Dmanagement.metrics.export.prometheus.enabled=true"
@@ -124,10 +163,11 @@ ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
     SERVER_PORT=8082 \
     LOGGING_LEVEL_ROOT=INFO
 
-# Enhanced entrypoint with conditional debug support and better logging
-ENTRYPOINT ["sh", "-c", "\
+# Enhanced entrypoint with tini init system and conditional debug support
+ENTRYPOINT ["tini", "--", "sh", "-c", "\
     echo 'Starting ping-service with Java ${JAVA_VERSION}...'; \
     echo 'Active Spring profiles: ${SPRING_PROFILES_ACTIVE}'; \
+    echo 'Container memory: '$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes 2>/dev/null || echo 'unlimited'); \
     if [ \"${DEBUG:-false}\" = \"true\" ]; then \
         echo 'DEBUG mode enabled - remote debugging available on port 5005'; \
         exec java ${JAVA_OPTS} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 -jar app.jar; \