chore(ping-service, build): remove local SecurityConfiguration, update Dockerfile, and adjust application.yaml
- Deleted `SecurityConfiguration.kt` in favor of centralized security standardization. - Optimized `Dockerfile` by replacing missing frontend directories with dummy paths for improved build stability. - Updated `application.yaml` with updated default Keycloak and Postgres configurations.
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
import org.gradle.api.tasks.SourceSet
|
|
||||||
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
|
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
|
||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
|
|||||||
@@ -3,36 +3,30 @@
|
|||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Multi-stage Dockerfile for Meldestelle Ping Service
|
# Multi-stage Dockerfile for Meldestelle Ping Service
|
||||||
# Features: Security hardening, monitoring support, optimal caching, BuildKit cache mounts
|
# Features: Security hardening, monitoring support, optimal caching, BuildKit cache mounts
|
||||||
# Version: 2.1.0 - Optimized and corrected version
|
# Version: 2.2.0 - Optimized for Monorepo (Fixed missing frontend dirs)
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
|
|
||||||
# === CENTRALIZED BUILD ARGUMENTS ===
|
# === CENTRALIZED BUILD ARGUMENTS ===
|
||||||
# Values sourced from docker/versions.toml and docker/build-args/
|
|
||||||
# Global arguments (docker/build-args/global.env)
|
|
||||||
ARG GRADLE_VERSION
|
ARG GRADLE_VERSION
|
||||||
ARG JAVA_VERSION
|
ARG JAVA_VERSION
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
|
|
||||||
# Note: No runtime profiles as build ARGs
|
# ===================================================================
|
||||||
|
# Build Stage
|
||||||
# Build stage: compile the ping-service JAR inside Docker
|
# ===================================================================
|
||||||
FROM gradle:${GRADLE_VERSION}-jdk${JAVA_VERSION}-alpine AS builder
|
FROM gradle:${GRADLE_VERSION}-jdk${JAVA_VERSION}-alpine AS builder
|
||||||
|
|
||||||
# Re-declare build arguments for this stage
|
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|
||||||
# Add metadata labels
|
|
||||||
LABEL stage=builder
|
LABEL stage=builder
|
||||||
LABEL service=ping-service
|
LABEL service=ping-service
|
||||||
LABEL maintainer="Meldestelle Development Team"
|
LABEL maintainer="Meldestelle Development Team"
|
||||||
LABEL version="${VERSION}"
|
|
||||||
LABEL build.date="${BUILD_DATE}"
|
|
||||||
|
|
||||||
WORKDIR /workspace
|
WORKDIR /workspace
|
||||||
|
|
||||||
# Gradle optimizations for containerized builds (removed deprecated configureondemand)
|
# Gradle optimizations
|
||||||
ENV GRADLE_OPTS="-Dorg.gradle.caching=true \
|
ENV GRADLE_OPTS="-Dorg.gradle.caching=true \
|
||||||
-Dorg.gradle.daemon=false \
|
-Dorg.gradle.daemon=false \
|
||||||
-Dorg.gradle.parallel=true \
|
-Dorg.gradle.parallel=true \
|
||||||
@@ -41,84 +35,76 @@ ENV GRADLE_OPTS="-Dorg.gradle.caching=true \
|
|||||||
-XX:+UseParallelGC \
|
-XX:+UseParallelGC \
|
||||||
-XX:MaxMetaspaceSize=512m"
|
-XX:MaxMetaspaceSize=512m"
|
||||||
|
|
||||||
# Set Gradle user home for better caching
|
|
||||||
ENV GRADLE_USER_HOME=/home/gradle/.gradle
|
ENV GRADLE_USER_HOME=/home/gradle/.gradle
|
||||||
|
|
||||||
# Copy gradle wrapper and configuration files first for optimal caching
|
# Copy gradle wrapper and configuration files
|
||||||
COPY gradlew gradlew.bat gradle.properties settings.gradle.kts ./
|
COPY gradlew gradlew.bat gradle.properties settings.gradle.kts ./
|
||||||
COPY gradle/ gradle/
|
COPY gradle/ gradle/
|
||||||
|
|
||||||
# Make gradlew executable (required on Linux/Unix systems)
|
|
||||||
RUN chmod +x gradlew
|
RUN chmod +x gradlew
|
||||||
|
|
||||||
# Copy platform dependencies (changes less frequently)
|
# Copy platform and core dependencies
|
||||||
COPY platform/ platform/
|
COPY platform/ platform/
|
||||||
|
|
||||||
# Copy frontend/client directories (required by settings.gradle.kts)
|
|
||||||
COPY frontend/ frontend/
|
|
||||||
|
|
||||||
# Copy core directories (required by settings.gradle.kts)
|
|
||||||
COPY core/ core/
|
COPY core/ core/
|
||||||
|
|
||||||
# Copy backend (includes services and infrastructure in new structure)
|
# Copy backend directories
|
||||||
COPY backend/ backend/
|
COPY backend/ backend/
|
||||||
|
|
||||||
# Copy contracts directory
|
|
||||||
COPY contracts/ contracts/
|
COPY contracts/ contracts/
|
||||||
|
|
||||||
# Copy docs directory (required by settings.gradle.kts)
|
# Create dummy frontend directories to satisfy settings.gradle.kts include paths
|
||||||
COPY docs/ docs/
|
RUN mkdir -p \
|
||||||
|
frontend/core/domain \
|
||||||
|
frontend/core/design-system \
|
||||||
|
frontend/core/navigation \
|
||||||
|
frontend/core/network \
|
||||||
|
frontend/core/local-db \
|
||||||
|
frontend/core/sync \
|
||||||
|
frontend/features/auth-feature \
|
||||||
|
frontend/features/ping-feature \
|
||||||
|
frontend/shared \
|
||||||
|
frontend/shells/meldestelle-portal \
|
||||||
|
docs
|
||||||
|
|
||||||
# Copy root build configuration
|
# Copy root build configuration
|
||||||
COPY build.gradle.kts ./
|
COPY build.gradle.kts ./
|
||||||
|
|
||||||
# Download and cache dependencies in a separate layer with build cache
|
# Download and cache dependencies
|
||||||
RUN --mount=type=cache,id=gradle-cache-ping,target=/home/gradle/.gradle/caches \
|
RUN --mount=type=cache,id=gradle-cache-ping,target=/home/gradle/.gradle/caches \
|
||||||
--mount=type=cache,id=gradle-wrapper-ping,target=/home/gradle/.gradle/wrapper \
|
--mount=type=cache,id=gradle-wrapper-ping,target=/home/gradle/.gradle/wrapper \
|
||||||
./gradlew :backend:services:ping:ping-service:dependencies --no-daemon --info
|
./gradlew :backend:services:ping:ping-service:dependencies --no-daemon --info
|
||||||
|
|
||||||
# Build the application with optimizations and build cache
|
# Build the application
|
||||||
RUN --mount=type=cache,id=gradle-cache-ping,target=/home/gradle/.gradle/caches \
|
RUN --mount=type=cache,id=gradle-cache-ping,target=/home/gradle/.gradle/caches \
|
||||||
--mount=type=cache,id=gradle-wrapper-ping,target=/home/gradle/.gradle/wrapper \
|
--mount=type=cache,id=gradle-wrapper-ping,target=/home/gradle/.gradle/wrapper \
|
||||||
./gradlew :backend:services:ping:ping-service:bootJar --no-daemon --info
|
./gradlew :backend:services:ping:ping-service:bootJar --no-daemon --info
|
||||||
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Runtime stage: optimized JRE image for production
|
# Runtime Stage
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine AS runtime
|
FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine AS runtime
|
||||||
|
|
||||||
# Build arguments for runtime stage
|
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
ARG JAVA_VERSION
|
ARG JAVA_VERSION
|
||||||
|
|
||||||
# Convert build arguments to environment variables
|
|
||||||
ENV JAVA_VERSION=${JAVA_VERSION} \
|
ENV JAVA_VERSION=${JAVA_VERSION} \
|
||||||
VERSION=${VERSION} \
|
VERSION=${VERSION} \
|
||||||
BUILD_DATE=${BUILD_DATE}
|
BUILD_DATE=${BUILD_DATE}
|
||||||
|
|
||||||
# Add comprehensive metadata
|
|
||||||
LABEL service="ping-service" \
|
LABEL service="ping-service" \
|
||||||
version="${VERSION}" \
|
version="${VERSION}" \
|
||||||
description="Microservice demonstrating circuit breaker patterns and monitoring" \
|
description="Microservice demonstrating circuit breaker patterns and monitoring" \
|
||||||
maintainer="Meldestelle Development Team" \
|
maintainer="Meldestelle Development Team" \
|
||||||
java.version="${JAVA_VERSION}" \
|
|
||||||
build.date="${BUILD_DATE}" \
|
|
||||||
org.opencontainers.image.title="Ping Service" \
|
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}"
|
org.opencontainers.image.created="${BUILD_DATE}"
|
||||||
|
|
||||||
# Build arguments for runtime configuration
|
|
||||||
ARG APP_USER=appuser
|
ARG APP_USER=appuser
|
||||||
ARG APP_GROUP=appgroup
|
ARG APP_GROUP=appgroup
|
||||||
ARG APP_UID=1001
|
ARG APP_UID=1001
|
||||||
ARG APP_GID=1001
|
ARG APP_GID=1001
|
||||||
|
|
||||||
# Set working directory
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Enhanced Alpine setup with security hardening
|
|
||||||
RUN apk update && \
|
RUN apk update && \
|
||||||
apk upgrade && \
|
apk upgrade && \
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
@@ -132,22 +118,16 @@ RUN apk update && \
|
|||||||
chown -R ${APP_USER}:${APP_GROUP} /app && \
|
chown -R ${APP_USER}:${APP_GROUP} /app && \
|
||||||
chmod -R 750 /app
|
chmod -R 750 /app
|
||||||
|
|
||||||
# Copy the built JAR from builder stage with proper ownership
|
|
||||||
COPY --from=builder --chown=${APP_USER}:${APP_GROUP} \
|
COPY --from=builder --chown=${APP_USER}:${APP_GROUP} \
|
||||||
/workspace/backend/services/ping/ping-service/build/libs/*.jar app.jar
|
/workspace/backend/services/ping/ping-service/build/libs/*.jar app.jar
|
||||||
|
|
||||||
# Switch to non-root user
|
|
||||||
USER ${APP_USER}
|
USER ${APP_USER}
|
||||||
|
|
||||||
# Expose application port and debug port
|
|
||||||
EXPOSE 8082 5005
|
EXPOSE 8082 5005
|
||||||
|
|
||||||
# Enhanced health check with better configuration
|
|
||||||
HEALTHCHECK --interval=15s --timeout=3s --start-period=40s --retries=3 \
|
HEALTHCHECK --interval=15s --timeout=3s --start-period=40s --retries=3 \
|
||||||
CMD curl -fsS --max-time 2 http://localhost:8082/actuator/health/readiness || exit 1
|
CMD curl -fsS --max-time 2 http://localhost:8082/actuator/health/readiness || exit 1
|
||||||
|
|
||||||
# Optimized JVM settings for Spring Boot microservice with Java 25
|
|
||||||
# Removed deprecated UseTransparentHugePages flag for better compatibility
|
|
||||||
ENV JAVA_OPTS="-XX:MaxRAMPercentage=75.0 \
|
ENV JAVA_OPTS="-XX:MaxRAMPercentage=75.0 \
|
||||||
-XX:+UseG1GC \
|
-XX:+UseG1GC \
|
||||||
-XX:+UseStringDeduplication \
|
-XX:+UseStringDeduplication \
|
||||||
@@ -166,13 +146,10 @@ ENV JAVA_OPTS="-XX:MaxRAMPercentage=75.0 \
|
|||||||
-Dmanagement.endpoint.health.show-details=always \
|
-Dmanagement.endpoint.health.show-details=always \
|
||||||
-Dmanagement.prometheus.metrics.export.enabled=true"
|
-Dmanagement.prometheus.metrics.export.enabled=true"
|
||||||
|
|
||||||
# Spring Boot configuration
|
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
|
||||||
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS
|
SERVER_PORT=8082 \
|
||||||
ENV SERVER_PORT=8082
|
LOGGING_LEVEL_ROOT=INFO
|
||||||
ENV LOGGING_LEVEL_ROOT=INFO
|
|
||||||
|
|
||||||
# Enhanced entrypoint with tini init system and conditional debug support
|
|
||||||
# Fixed memory cgroup path for better compatibility with different container runtimes
|
|
||||||
ENTRYPOINT ["tini", "--", "sh", "-c", "\
|
ENTRYPOINT ["tini", "--", "sh", "-c", "\
|
||||||
echo 'Starting Ping Service with Java ${JAVA_VERSION}...'; \
|
echo 'Starting Ping Service with Java ${JAVA_VERSION}...'; \
|
||||||
echo 'Service port: ${SERVER_PORT}'; \
|
echo 'Service port: ${SERVER_PORT}'; \
|
||||||
|
|||||||
-36
@@ -1,36 +0,0 @@
|
|||||||
package at.mocode.ping.service.config
|
|
||||||
|
|
||||||
import org.springframework.context.annotation.Bean
|
|
||||||
import org.springframework.context.annotation.Configuration
|
|
||||||
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity
|
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity
|
|
||||||
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
|
|
||||||
import org.springframework.security.config.http.SessionCreationPolicy
|
|
||||||
import org.springframework.security.web.SecurityFilterChain
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Security configuration for the Ping Service.
|
|
||||||
* Enables method-level security for fine-grained authorization control.
|
|
||||||
*/
|
|
||||||
@Configuration
|
|
||||||
@EnableWebSecurity
|
|
||||||
@EnableMethodSecurity(prePostEnabled = true)
|
|
||||||
class SecurityConfiguration {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
fun securityFilterChain(http: HttpSecurity): SecurityFilterChain {
|
|
||||||
return http
|
|
||||||
.csrf { it.disable() }
|
|
||||||
.sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.STATELESS) }
|
|
||||||
.authorizeHttpRequests { auth ->
|
|
||||||
auth
|
|
||||||
// Allow health check endpoints
|
|
||||||
.requestMatchers("/actuator/**", "/health/**").permitAll()
|
|
||||||
// Allow ping endpoints for monitoring (these are typically public)
|
|
||||||
.requestMatchers("/ping/**").permitAll()
|
|
||||||
// All other endpoints require authentication (handled by method-level security)
|
|
||||||
.anyRequest().authenticated()
|
|
||||||
}
|
|
||||||
.build()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -9,9 +9,10 @@ spring:
|
|||||||
active: ${SPRING_PROFILES_ACTIVE:dev}
|
active: ${SPRING_PROFILES_ACTIVE:dev}
|
||||||
|
|
||||||
datasource:
|
datasource:
|
||||||
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/meldestelle}
|
# Defaults für lokalen Start (Docker Compose Ports)
|
||||||
username: ${SPRING_DATASOURCE_USERNAME:postgres}
|
url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/pg-meldestelle-db}
|
||||||
password: ${SPRING_DATASOURCE_PASSWORD:postgres}
|
username: ${SPRING_DATASOURCE_USERNAME:pg-user}
|
||||||
|
password: ${SPRING_DATASOURCE_PASSWORD:pg-password}
|
||||||
driver-class-name: org.postgresql.Driver
|
driver-class-name: org.postgresql.Driver
|
||||||
|
|
||||||
jpa:
|
jpa:
|
||||||
@@ -28,9 +29,9 @@ spring:
|
|||||||
oauth2:
|
oauth2:
|
||||||
resourceserver:
|
resourceserver:
|
||||||
jwt:
|
jwt:
|
||||||
# Keycloak URL (innerhalb Docker Netzwerk oder Localhost)
|
# Keycloak URL (lokal via Port Forwarding)
|
||||||
issuer-uri: ${KEYCLOAK_ISSUER_URI:http://localhost:9090/realms/meldestelle}
|
issuer-uri: ${KEYCLOAK_ISSUER_URI:http://localhost:8180/realms/meldestelle}
|
||||||
jwk-set-uri: ${KEYCLOAK_JWK_SET_URI:http://localhost:9090/realms/meldestelle/protocol/openid-connect/certs}
|
jwk-set-uri: ${KEYCLOAK_JWK_SET_URI:http://localhost:8180/realms/meldestelle/protocol/openid-connect/certs}
|
||||||
|
|
||||||
cloud:
|
cloud:
|
||||||
consul:
|
consul:
|
||||||
|
|||||||
Reference in New Issue
Block a user