* chore(MP-21): snapshot pre-refactor state (Epic 1)
* chore(MP-22): scaffold new repo structure, relocate Docker Compose, move frontend/backend modules, update Makefile; add docs mapping and env template
* MP-22 Epic 2: Erfolgreich umgesetzt und verifiziert
* MP-23 Epic 3: Gradle/Build Governance zentralisieren
* MP-23 Epic 3: Gradle/Build Governance zentralisieren
* chore(devops)!: Docker-SSoT (.env) konsolidiert, Compose-Mounts ergänzt, Makefile entfernt
- ENV Single Source of Truth
- docker/.env.example neu (inkl. REDIS_PASSWORD, Ports, Build-Overrides)
- config/.env(.example) als DEPRECATED markiert (Verweis auf docker/.env[.example])
- Docker Compose vereinheitlicht (docker/docker-compose.yaml)
- Postgres: zentralen postgresql.conf mounten (../config/postgres/postgresql.conf)
und Start mit -c config_file=/etc/postgresql/postgresql.conf
- Redis: zentralen redis.conf mounten (../config/redis/redis.conf)
und Start via "redis-server … ${REDIS_PASSWORD:+--requirepass $REDIS_PASSWORD}"
- Web-Nginx: ../config/nginx/nginx.prod.conf → /etc/nginx/nginx.conf (ro)
- Monitoring: Prometheus/Grafana nutzen ../config/monitoring/* als SSoT
- Frontend/DI/Network (MP-23 Grundlage)
- :frontend:core:network Modul mit Koin `apiClient` (Ktor + JSON/Retry/Timeout/Logging)
- Plattform-Basis-URL-Auflösung (JVM: ENV API_BASE_URL; JS: globalThis.API_BASE_URL / Same-Origin)
- Web index.html setzt API_BASE_URL (Query `?apiBaseUrl=…` > Same-Origin > Fallback)
- Build/Gradle & Module-Refs
- settings.gradle.kts: neue Frontend-/Backend-Pfade bereits inkludiert
- Features/Shell: Abhängigkeiten auf :frontend:shared / :frontend:core:* angepasst
- Ping-API-Refs auf :backend:services:ping:ping-api vereinheitlicht
- Dockerfiles angepasst
- backend/infrastructure/gateway/Dockerfile → Tasks/Pfade auf :backend:gateway
- backend/services/ping/Dockerfile → Tasks/Pfade auf :backend:services:ping:ping-service
- Static Analysis / Guards
- config/detekt/detekt.yml hinzugefügt
- Leichter Arch-Guard (Frontend) gegen manuelle Authorization-Header vorbereitet
- Doku
- docs/ARCHITECTURE.md (Struktur, Mapping, Next Steps) ergänzt
- docs/adr/README.md angelegt
BREAKING CHANGES:
- Makefile komplett entfernt (bitte direkt `docker compose` verwenden)
- ENV-Quelle ist jetzt docker/.env (statt config/.env oder Root)
- Compose-Datei unter docker/docker-compose.yaml (nicht mehr compose.yaml im Repo-Root)
Verifikation (lokal):
- ENV anlegen: `cp docker/.env.example docker/.env` (Werte anpassen)
- Compose prüfen: `docker compose --env-file docker/.env -f docker/docker-compose.yaml config`
- Infrastruktur: `docker compose --env-file docker/.env -f docker/docker-compose.yaml -p meldestelle up -d postgres redis keycloak web-app`
- Services bauen: `docker compose --env-file docker/.env -f docker/docker-compose.yaml -p meldestelle build api-gateway ping-service --no-cache --progress=plain`
Refs: MP-22 (Epic 2), MP-23 (Epic 3)
* chore(devops)!: Docker-SSoT (.env) konsolidiert, Compose-Mounts ergänzt, Makefile entfernt
- ENV Single Source of Truth
- docker/.env.example neu (inkl. REDIS_PASSWORD, Ports, Build-Overrides)
- config/.env(.example) als DEPRECATED markiert (Verweis auf docker/.env[.example])
- Docker Compose vereinheitlicht (docker/docker-compose.yaml)
- Postgres: zentralen postgresql.conf mounten (../config/postgres/postgresql.conf)
und Start mit -c config_file=/etc/postgresql/postgresql.conf
- Redis: zentralen redis.conf mounten (../config/redis/redis.conf)
und Start via "redis-server … ${REDIS_PASSWORD:+--requirepass $REDIS_PASSWORD}"
- Web-Nginx: ../config/nginx/nginx.prod.conf → /etc/nginx/nginx.conf (ro)
- Monitoring: Prometheus/Grafana nutzen ../config/monitoring/* als SSoT
- Frontend/DI/Network (MP-23 Grundlage)
- :frontend:core:network Modul mit Koin `apiClient` (Ktor + JSON/Retry/Timeout/Logging)
- Plattform-Basis-URL-Auflösung (JVM: ENV API_BASE_URL; JS: globalThis.API_BASE_URL / Same-Origin)
- Web index.html setzt API_BASE_URL (Query `?apiBaseUrl=…` > Same-Origin > Fallback)
- Build/Gradle & Module-Refs
- settings.gradle.kts: neue Frontend-/Backend-Pfade bereits inkludiert
- Features/Shell: Abhängigkeiten auf :frontend:shared / :frontend:core:* angepasst
- Ping-API-Refs auf :backend:services:ping:ping-api vereinheitlicht
- Dockerfiles angepasst
- backend/infrastructure/gateway/Dockerfile → Tasks/Pfade auf :backend:gateway
- backend/services/ping/Dockerfile → Tasks/Pfade auf :backend:services:ping:ping-service
- Static Analysis / Guards
- config/detekt/detekt.yml hinzugefügt
- Leichter Arch-Guard (Frontend) gegen manuelle Authorization-Header vorbereitet
- Doku
- docs/ARCHITECTURE.md (Struktur, Mapping, Next Steps) ergänzt
- docs/adr/README.md angelegt
BREAKING CHANGES:
- Makefile komplett entfernt (bitte direkt `docker compose` verwenden)
- ENV-Quelle ist jetzt docker/.env (statt config/.env oder Root)
- Compose-Datei unter docker/docker-compose.yaml (nicht mehr compose.yaml im Repo-Root)
Verifikation (lokal):
- ENV anlegen: `cp docker/.env.example docker/.env` (Werte anpassen)
- Compose prüfen: `docker compose --env-file docker/.env -f docker/docker-compose.yaml config`
- Infrastruktur: `docker compose --env-file docker/.env -f docker/docker-compose.yaml -p meldestelle up -d postgres redis keycloak web-app`
- Services bauen: `docker compose --env-file docker/.env -f docker/docker-compose.yaml -p meldestelle build api-gateway ping-service --no-cache --progress=plain`
Refs: MP-22 (Epic 2), MP-23 (Epic 3)
* chore(devops)!: Docker-SSoT (.env) konsolidiert, Compose-Mounts ergänzt, Makefile entfernt
- ENV Single Source of Truth
- docker/.env.example neu (inkl. REDIS_PASSWORD, Ports, Build-Overrides)
- config/.env(.example) als DEPRECATED markiert (Verweis auf docker/.env[.example])
- Docker Compose vereinheitlicht (docker/docker-compose.yaml)
- Postgres: zentralen postgresql.conf mounten (../config/postgres/postgresql.conf)
und Start mit -c config_file=/etc/postgresql/postgresql.conf
- Redis: zentralen redis.conf mounten (../config/redis/redis.conf)
und Start via "redis-server … ${REDIS_PASSWORD:+--requirepass $REDIS_PASSWORD}"
- Web-Nginx: ../config/nginx/nginx.prod.conf → /etc/nginx/nginx.conf (ro)
- Monitoring: Prometheus/Grafana nutzen ../config/monitoring/* als SSoT
- Frontend/DI/Network (MP-23 Grundlage)
- :frontend:core:network Modul mit Koin `apiClient` (Ktor + JSON/Retry/Timeout/Logging)
- Plattform-Basis-URL-Auflösung (JVM: ENV API_BASE_URL; JS: globalThis.API_BASE_URL / Same-Origin)
- Web index.html setzt API_BASE_URL (Query `?apiBaseUrl=…` > Same-Origin > Fallback)
- Build/Gradle & Module-Refs
- settings.gradle.kts: neue Frontend-/Backend-Pfade bereits inkludiert
- Features/Shell: Abhängigkeiten auf :frontend:shared / :frontend:core:* angepasst
- Ping-API-Refs auf :backend:services:ping:ping-api vereinheitlicht
- Dockerfiles angepasst
- backend/infrastructure/gateway/Dockerfile → Tasks/Pfade auf :backend:gateway
- backend/services/ping/Dockerfile → Tasks/Pfade auf :backend:services:ping:ping-service
- Static Analysis / Guards
- config/detekt/detekt.yml hinzugefügt
- Leichter Arch-Guard (Frontend) gegen manuelle Authorization-Header vorbereitet
- Doku
- docs/ARCHITECTURE.md (Struktur, Mapping, Next Steps) ergänzt
- docs/adr/README.md angelegt
BREAKING CHANGES:
- Makefile komplett entfernt (bitte direkt `docker compose` verwenden)
- ENV-Quelle ist jetzt docker/.env (statt config/.env oder Root)
- Compose-Datei unter docker/docker-compose.yaml (nicht mehr compose.yaml im Repo-Root)
Verifikation (lokal):
- ENV anlegen: `cp docker/.env.example docker/.env` (Werte anpassen)
- Compose prüfen: `docker compose --env-file docker/.env -f docker/docker-compose.yaml config`
- Infrastruktur: `docker compose --env-file docker/.env -f docker/docker-compose.yaml -p meldestelle up -d postgres redis keycloak web-app`
- Services bauen: `docker compose --env-file docker/.env -f docker/docker-compose.yaml -p meldestelle build api-gateway ping-service --no-cache --progress=plain`
Refs: MP-22 (Epic 2), MP-23 (Epic 3)
* chore(ci): Workflows an Docker-SSoT & neue Struktur angepasst, minimaler SSoT-Guard
- ssot-guard.yml: Option B (minimal) → `docker compose -f docker/docker-compose.yaml config` als Lint
- integration-tests.yml: `./gradlew staticAnalysis` vor Integrationstests
- docs-kdoc-sync.yml: Dokka-Task Fallback (dokkaGfmAll || dokkaGfm), YouTrack-Sync nur wenn Script vorhanden
- deploy-proxmox.yml: Compose-Pfade auf docker/docker-compose.yaml + `--env-file docker/.env`; Build/Test Schritte vereinheitlicht
- ci-main.yml: SSoT-Skripte per `if: hashFiles(...)` guarded, Compose-Lint Fallback; OpenAPI‑Pfad → backend/gateway; ADR‑Pfade → docs/adr/**; `staticAnalysis` in Build integriert
- youtrack-sync.yml: unverändert (funktional)
Refs: MP-22, MP-23
* chore(ci): Workflows an Docker-SSoT & neue Struktur angepasst, minimaler SSoT-Guard
- ssot-guard.yml: Option B (minimal) → `docker compose -f docker/docker-compose.yaml config` als Lint
- integration-tests.yml: `./gradlew staticAnalysis` vor Integrationstests
- docs-kdoc-sync.yml: Dokka-Task Fallback (dokkaGfmAll || dokkaGfm), YouTrack-Sync nur wenn Script vorhanden
- deploy-proxmox.yml: Compose-Pfade auf docker/docker-compose.yaml + `--env-file docker/.env`; Build/Test Schritte vereinheitlicht
- ci-main.yml: SSoT-Skripte per `if: hashFiles(...)` guarded, Compose-Lint Fallback; OpenAPI‑Pfad → backend/gateway; ADR‑Pfade → docs/adr/**; `staticAnalysis` in Build integriert
- youtrack-sync.yml: unverändert (funktional)
Refs: MP-22, MP-23
* fix(ci): create .env from example before validating compose config
* fix(ci): update ssot-guard filename (.yaml) and sync workflow state
* fixing
* fix(webpack): correct sql.js fallback configuration for webpack 5
202 lines
7.7 KiB
Docker
202 lines
7.7 KiB
Docker
# syntax=docker/dockerfile:1.8
|
|
|
|
# ===================================================================
|
|
# Multi-stage Dockerfile for Meldestelle API Gateway
|
|
# Features: Security hardening, monitoring support, optimal caching, BuildKit cache mounts
|
|
# Version: 2.1.0 - Optimized and corrected version
|
|
# ===================================================================
|
|
|
|
# === CENTRALIZED BUILD ARGUMENTS ===
|
|
# Values sourced from docker/versions.toml and docker/build-args/
|
|
# Global arguments (docker/build-args/global.env)
|
|
ARG GRADLE_VERSION
|
|
ARG JAVA_VERSION
|
|
ARG BUILD_DATE
|
|
ARG VERSION
|
|
|
|
# Infrastructure-specific arguments (docker/build-args/infrastructure.env)
|
|
# Note: No runtime profiles as build ARGs
|
|
|
|
# ===================================================================
|
|
# Build Stage
|
|
# ===================================================================
|
|
FROM gradle:${GRADLE_VERSION}-jdk${JAVA_VERSION}-alpine AS builder
|
|
|
|
# Re-declare build arguments for this stage
|
|
ARG VERSION
|
|
ARG BUILD_DATE
|
|
|
|
LABEL stage=builder
|
|
LABEL service="api-gateway"
|
|
LABEL maintainer="Meldestelle Development Team"
|
|
LABEL version="${VERSION}"
|
|
LABEL build.date="${BUILD_DATE}"
|
|
|
|
WORKDIR /workspace
|
|
|
|
# Gradle optimizations for containerized builds (removed deprecated configureondemand)
|
|
ENV GRADLE_OPTS="-Dorg.gradle.caching=true \
|
|
-Dorg.gradle.daemon=false \
|
|
-Dorg.gradle.parallel=true \
|
|
-Dorg.gradle.workers.max=2 \
|
|
-Dorg.gradle.jvmargs=-Xmx2g \
|
|
-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 ./
|
|
COPY gradle/ gradle/
|
|
|
|
# Make gradlew executable (required on Linux/Unix systems)
|
|
RUN chmod +x gradlew
|
|
|
|
# Copy platform dependencies (changes less frequently)
|
|
COPY platform/ platform/
|
|
COPY core/ core/
|
|
|
|
# Copy infrastructure directories (required by settings.gradle.kts)
|
|
# Copy infrastructure directories (required by settings.gradle.kts)
|
|
COPY infrastructure/ infrastructure/
|
|
|
|
# Copy domains directory (required by settings.gradle.kts)
|
|
COPY domains/ domains/
|
|
|
|
# Copy services directories (required by settings.gradle.kts)
|
|
COPY services/ services/
|
|
COPY backend/ backend/
|
|
|
|
# Copy client directories (required by settings.gradle.kts)
|
|
COPY clients/ clients/
|
|
|
|
# Copy docs directory (required by settings.gradle.kts)
|
|
COPY docs/ docs/
|
|
|
|
# Copy root build configuration
|
|
COPY build.gradle.kts ./
|
|
|
|
# Download and cache dependencies with BuildKit cache mount (removed deprecated flag)
|
|
RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
|
|
--mount=type=cache,target=/home/gradle/.gradle/wrapper \
|
|
./gradlew :backend:gateway:dependencies --info
|
|
|
|
# Build the application with optimizations and build cache (removed deprecated flag)
|
|
RUN --mount=type=cache,target=/home/gradle/.gradle/caches \
|
|
--mount=type=cache,target=/home/gradle/.gradle/wrapper \
|
|
./gradlew :backend:gateway:bootJar --info
|
|
|
|
# Extract JAR layers for better caching in runtime stage
|
|
RUN mkdir -p build/dependency && \
|
|
(cd build/dependency; java -Djarmode=layertools -jar /workspace/backend/gateway/build/libs/*.jar extract)
|
|
|
|
# ===================================================================
|
|
# Runtime Stage
|
|
# ===================================================================
|
|
FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine AS runtime
|
|
#eclipse-temurin:21-jre-alpine-3.22
|
|
|
|
# Build arguments for runtime stage
|
|
ARG BUILD_DATE
|
|
ARG VERSION
|
|
ARG JAVA_VERSION
|
|
|
|
# Convert build arguments to environment variables
|
|
ENV JAVA_VERSION=${JAVA_VERSION} \
|
|
VERSION=${VERSION} \
|
|
BUILD_DATE=${BUILD_DATE}
|
|
|
|
# Enhanced metadata
|
|
LABEL service="api-gateway" \
|
|
version="${VERSION}" \
|
|
description="Spring Cloud Gateway for Meldestelle microservices architecture" \
|
|
maintainer="Meldestelle Development Team" \
|
|
java.version="${JAVA_VERSION}" \
|
|
build.date="${BUILD_DATE}" \
|
|
org.opencontainers.image.title="Meldestelle API Gateway" \
|
|
org.opencontainers.image.description="Spring Cloud Gateway with service discovery and monitoring" \
|
|
org.opencontainers.image.version="${VERSION}" \
|
|
org.opencontainers.image.vendor="Österreichischer Pferdesportverband" \
|
|
org.opencontainers.image.created="${BUILD_DATE}"
|
|
|
|
# Build arguments for user configuration
|
|
ARG APP_USER=gateway
|
|
ARG APP_GROUP=gateway
|
|
ARG APP_UID=1001
|
|
ARG APP_GID=1001
|
|
|
|
WORKDIR /app
|
|
|
|
# Enhanced Alpine setup with security hardening
|
|
RUN apk update && \
|
|
apk upgrade && \
|
|
apk add --no-cache \
|
|
curl \
|
|
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 /app/config && \
|
|
chown -R ${APP_USER}:${APP_GROUP} /app && \
|
|
chmod -R 750 /app
|
|
|
|
# Copy Spring Boot layers from builder stage for optimal caching
|
|
COPY --from=builder --chown=${APP_USER}:${APP_GROUP} /workspace/build/dependency/dependencies/ ./
|
|
COPY --from=builder --chown=${APP_USER}:${APP_GROUP} /workspace/build/dependency/spring-boot-loader/ ./
|
|
COPY --from=builder --chown=${APP_USER}:${APP_GROUP} /workspace/build/dependency/snapshot-dependencies/ ./
|
|
COPY --from=builder --chown=${APP_USER}:${APP_GROUP} /workspace/build/dependency/application/ ./
|
|
|
|
# Switch to non-root user
|
|
USER ${APP_USER}
|
|
|
|
# Expose application port and debug port
|
|
EXPOSE 8081 5005
|
|
|
|
# Enhanced health check with better configuration
|
|
HEALTHCHECK --interval=15s --timeout=3s --start-period=40s --retries=3 \
|
|
CMD curl -fsS --max-time 2 http://localhost:8081/actuator/health/readiness || exit 1
|
|
|
|
# Optimized JVM settings for Spring Cloud Gateway with Java 21
|
|
# Removed deprecated UseTransparentHugePages flag for better compatibility
|
|
ENV JAVA_OPTS="-XX:MaxRAMPercentage=80.0 \
|
|
-XX:+UseG1GC \
|
|
-XX:+UseStringDeduplication \
|
|
-XX:+UseContainerSupport \
|
|
-XX:G1HeapRegionSize=16m \
|
|
-XX:G1ReservePercent=25 \
|
|
-XX:InitiatingHeapOccupancyPercent=30 \
|
|
-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,gateway \
|
|
-Dmanagement.endpoint.health.show-details=always \
|
|
-Dmanagement.prometheus.metrics.export.enabled=true"
|
|
|
|
# Spring Boot configuration (Profile nur zur Laufzeit setzen, nicht im Build)
|
|
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
|
|
SERVER_PORT=8081 \
|
|
LOGGING_LEVEL_ROOT=INFO \
|
|
LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_GATEWAY=DEBUG
|
|
|
|
# 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", "\
|
|
echo 'Starting API Gateway with Java ${JAVA_VERSION}...'; \
|
|
echo 'Active Spring profiles: '${SPRING_PROFILES_ACTIVE:-not-set}; \
|
|
echo 'Gateway port: ${SERVER_PORT}'; \
|
|
MEMORY_LIMIT=$(cat /sys/fs/cgroup/memory.max 2>/dev/null || cat /sys/fs/cgroup/memory/memory.limit_in_bytes 2>/dev/null || echo 'unlimited'); \
|
|
echo \"Container memory limit: $MEMORY_LIMIT\"; \
|
|
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 org.springframework.boot.loader.launch.JarLauncher; \
|
|
else \
|
|
echo 'Starting API Gateway in production mode'; \
|
|
exec java ${JAVA_OPTS} org.springframework.boot.loader.launch.JarLauncher; \
|
|
fi"]
|