* MP-8 OTHER Implementiere JWT-Authentifizierungs-Filter im Gateway * Fix(ci): Update upload-artifact action to v4 * Fix(ci): Add start command for Keycloak and failure logs * Fix(ci): Remove invalid 'command' property from Keycloak service * Fix(ci): Use KC_DEV_MODE env var to start Keycloak * Fix(ci): Keycloak service was removed from GitHub Actions services and replaced with a manual docker run step that starts Keycloak with the start-dev command. * dev(ci): vereinheitliche Keycloak auf 26.4.2; aktiviere Health im CI (MP-8) * Fix(ci): Stabilize Keycloak startup in integration tests via matrix - Add `dev-file` Keycloak variant to matrix for stability fallback. - Improve wait logic and health checks for Keycloak and Postgres. - Unify Keycloak version to 26.4.2 across codebase. - Add log dumps on failure. * Fix(ci): Die betroffene Datei docs/Visionen-Ideen/Infrastruktur-Strategie_DSGVO-Konformität.md endet aktuell mit genau einer leeren Zeile (Zeile 87). Das entspricht der Regel MD047 („Files should end with a single newline character“). Damit ist deine Korrektur korrekt. * Fix(ci): Repository-wide auto-fix for Markdown files was implemented with a GitHub Actions workflow and a local helper script. EditorConfig and markdownlint ignore files were added to ensure consistent formatting. Instructions for using the auto-fix both via GitHub Actions and locally were provided. * fix(gradle): build.gradle.kts jsBrowser testTask disabled * fix(gradle): build.gradle.kts jsBrowser testTask disabled * Fix(ci): Stabilize integration tests with Keycloak matrix build (MP-8) Introduces a matrix strategy (`keycloak_db: [postgres, dev-file]`) in the integration-tests workflow to mitigate flaky Keycloak starts when using the Postgres service container. - Adds a `dev-file` Keycloak variant for stability fallback. - Improves wait logic and health checks for Keycloak/Postgres. - Unifies Keycloak version to 26.4.2 across codebase (Dockerfile, Compose, ADR, README, tests). - Adds log dumps on failure in CI. - Ensures `KC_HEALTH_ENABLED=true` is set. - Updates related documentation (README, Schlachtplan). - Includes broader Docker SSoT cleanup (versions.toml as source, script updates, env file cleanup, validator hardening). This resolves recurring CI failures related to Keycloak startup and ensures required checks for PRs (#15) are reliable, while also improving overall Docker build consistency. * feat(docs, ci): Implement YouTrack SSoT strategy with Dokka sync (MP-8) - Add Dokka multi-module Gradle configuration and KDoc style guide. - Add GitHub Actions workflow (docs-kdoc-sync.yml) and Python script (youtrack-sync-kb.py) to sync Dokka GFM output to YouTrack KB. - Extend front-matter schema (bc, doc_type) and update relevant pages/stubs. - Adapt CI scripts (validate-frontmatter, check-docs-drift, ci-docs link ignore). - Update README.md to reference YouTrack KB. * feat(docs, ci): Implement YouTrack SSoT strategy with Dokka sync (MP-8) - Add Dokka multi-module Gradle configuration and KDoc style guide. - Add GitHub Actions workflow (docs-kdoc-sync.yml) and Python script (youtrack-sync-kb.py) to sync Dokka GFM output to YouTrack KB. - Extend front-matter schema (bc, doc_type) and update relevant pages/stubs. - Adapt CI scripts (validate-frontmatter, check-docs-drift, ci-docs link ignore). - Update README.md to reference YouTrack KB. * Fix(ci): Replace OpenAPI validator with Spectral Replaces the deprecated 'char0n/swagger-editor-validate' action, which failed due to sandbox issues in GitHub Actions, with the modern '@stoplight/spectral-cli'. This ensures robust OpenAPI specification validation without requiring a headless browser environment. The 'generate-api-docs' job now depends on the successful completion of the Spectral validation. Part of resolving CI failures for PR #15 (MP-8). * Fix(ci): Specify spectral:oas ruleset for OpenAPI validation (MP-8) * Fix(ci): Remove explicit ruleset argument for Spectral validation (MP-8) * Fix(ci): Added a .spectral.yaml file to fix Spectral linting errors. Corrected markdown lint issues in two documentation files. Updated README.md with a new guidelines section to fix link validation errors. * Fix(ci): Markdownlint errors were fixed by adding required blank lines. The Guidelines Validation error was resolved by updating the README.md link. The API Documentation Generator workflow was stabilized by updating paths, tasks, and validation steps. * Fix(ci): Alle vier fehlerhaften GitHub-Action-Prüfungen wurden behoben. Fehler in der OpenAPI-Spezifikation, Probleme mit der Markdown-Linting-Analyse und Validierungsfehler bei Querverweisen wurden korrigiert. Die README.md enthält nun alle erforderlichen Links zu den Richtlinien. * Fix(ci): Markdown linting errors in docs/api/README.md were fixed by specifying languages in fenced code blocks. OpenAPI specification errors in documentation.yaml were resolved by correcting example property types to strings. Cross-reference validation errors in README.md were fixed by adding the missing link to project-standards/coding-standards.md. * Fix(ci): Duplicate heading errors in docs/api/members-api.md were fixed. Cross-reference validation errors for docker-architecture.md were resolved. All originally reported issues passed validation successfully. * Fix(ci): The markdown heading levels in docs/api/members-api.md were corrected from h5 to h4 to fix linting errors. The missing cross-reference link from technology-guides/docker/docker-development.md to docker-overview.md was added. These fixes resolved the original validation and linting errors causing the process to fail. * Fix(ci): Duplicate heading warnings in docs/api/members-api.md were resolved. Cross-reference validation for docker-development.md to docker-architecture.md was fixed. A new unrelated warning about docker-production.md was identified but not addressed. * refactor(ci,docs): Simplify CI pipeline and migrate docs to YouTrack SSoT BREAKING CHANGE: Documentation structure radically simplified - Consolidate 9 GitHub Actions workflows into 1 main pipeline (ci-main.yml) - Remove redundant workflows: ci-docs, markdownlint-autofix, guidelines-validation, api-docs - Delete documentation migrated to YouTrack: api/, BCs/, Visionen-Ideen/, reference/, now/, overview/ - Keep only ADRs, C4 diagrams, and essential dev guides in repo - Update README.md with YouTrack KB links - Create new docs/README.md as documentation gateway - Relax markdown-lint config for pragmatic developer experience Kept workflows: - ssot-guard.yml (Docker SSoT validation) - docs-kdoc-sync.yml (KDoc → YouTrack sync) - integration-tests.yml (Integration tests) - deploy-proxmox.yml (Deployment) - youtrack-sync.yml (YouTrack integration) Related: MP-DOCS-001 * refactor(ci,docs): Simplify CI pipeline and migrate docs to YouTrack SSoT BREAKING CHANGE: Documentation structure radically simplified - Consolidate 9 GitHub Actions workflows into 1 main pipeline (ci-main.yml) - Remove redundant workflows: ci-docs, markdownlint-autofix, guidelines-validation, api-docs - Delete documentation migrated to YouTrack: api/, BCs/, Visionen-Ideen/, reference/, now/, overview/ - Keep only ADRs, C4 diagrams, and essential dev guides in repo - Update README.md with YouTrack KB links - Create new docs/README.md as documentation gateway - Relax markdown-lint config for pragmatic developer experience Kept workflows: - ssot-guard.yml (Docker SSoT validation) - docs-kdoc-sync.yml (KDoc → YouTrack sync) - integration-tests.yml (Integration tests) - deploy-proxmox.yml (Deployment) - youtrack-sync.yml (YouTrack integration) Related: MP-DOCS-001 * refactor(ci,docs): README.md und einige andere Dokumentationen überarbeitet. ports-and-urls.md hinzugefügt. Related: MP-DOCS-001 * refactor(ci,docs): Die Markdownlint-Fehler in README.md und docs/README.md wurden behoben, indem die Überschriftenebenen angepasst, überflüssige Satzzeichen am Ende entfernt und die notwendigen Leerzeilen um Überschriften, Listen, Tabellen und Codeblöcke eingefügt wurden. Das problematische Leerzeichen am Ende in docs/README.md wurde ebenfalls entfernt. Die Dateien entsprechen nun den vorgegebenen Markdownlint-Regeln und sollten die CI-Validierung bestehen. Related: MP-DOCS-001 * refactor(ci,docs): Docker guideline cross-references were fixed and normalized to lowercase labels. Validation scripts confirmed zero cross-reference warnings and consistent metadata. Documentation was updated with a changelog and enhanced README navigation. Related: MP-DOCS-001 * refactor(ci,docs): Docker guideline cross-references were fixed and normalized to lowercase labels. Validation scripts confirmed zero cross-reference warnings and consistent metadata. Documentation was updated with a changelog and enhanced README navigation. Related: MP-DOCS-001 * refactor(ci,docs): Dead links in docs/architecture/adr were fixed by updating URLs to stable sources and adding an ignore pattern for a placeholder link. Specific ADR files had their broken links replaced with valid ones. The markdown-link-check GitHub Action is expected to pass with zero dead links now. Related: MP-DOCS-001 * refactor(ci,docs): Links in ADR checked Related: MP-DOCS-001 * refactor(ci,docs): Links in ADR checked Related: MP-DOCS-001 * refactor(ci,docs): Markdown Regeln ausgebessert Related: MP-DOCS-001 * refactor(ci,docs): Markdown Regeln ausgebessert Related: MP-DOCS-001 * refactor(ci,docs): Markdown Regeln ausgebessert Related: MP-DOCS-001 * Chore: Rerun CI checks with updated branch protection rules
342 lines
11 KiB
Bash
Executable File
342 lines
11 KiB
Bash
Executable File
#!/bin/bash
|
|
# ===================================================================
|
|
# Docker Versions Update Utility
|
|
# Updates central docker/versions.toml and syncs to environment files
|
|
# ===================================================================
|
|
|
|
set -e
|
|
|
|
# Script directory and project root
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|
DOCKER_DIR="$PROJECT_ROOT/docker"
|
|
VERSIONS_TOML="$DOCKER_DIR/versions.toml"
|
|
BUILD_ARGS_DIR="$DOCKER_DIR/build-args"
|
|
|
|
# Colors for output
|
|
RED='\033[0;31m'
|
|
GREEN='\033[0;32m'
|
|
YELLOW='\033[1;33m'
|
|
BLUE='\033[0;34m'
|
|
NC='\033[0m' # No Color
|
|
|
|
# Function to print colored output
|
|
print_info() {
|
|
echo -e "${BLUE}[INFO]${NC} $1"
|
|
}
|
|
|
|
print_success() {
|
|
echo -e "${GREEN}[SUCCESS]${NC} $1"
|
|
}
|
|
|
|
print_warning() {
|
|
echo -e "${YELLOW}[WARNING]${NC} $1"
|
|
}
|
|
|
|
print_error() {
|
|
echo -e "${RED}[ERROR]${NC} $1"
|
|
}
|
|
|
|
# Function to extract version from TOML file
|
|
get_version() {
|
|
local key=$1
|
|
grep "^$key = " "$VERSIONS_TOML" | sed 's/.*= "\(.*\)"/\1/' || echo ""
|
|
}
|
|
|
|
# Function to update version in TOML file
|
|
update_version() {
|
|
local key=$1
|
|
local new_value=$2
|
|
|
|
if grep -q "^$key = " "$VERSIONS_TOML"; then
|
|
# Update existing key
|
|
sed -i.bak "s/^$key = .*/$key = \"$new_value\"/" "$VERSIONS_TOML"
|
|
print_success "Updated $key to $new_value"
|
|
else
|
|
print_error "Key $key not found in $VERSIONS_TOML"
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
# Function to sync TOML to environment files
|
|
sync_to_env_files() {
|
|
print_info "Syncing versions.toml to environment files..."
|
|
|
|
# Get current versions from TOML
|
|
# shellcheck disable=SC2155
|
|
local gradle_version=$(get_version "gradle")
|
|
# shellcheck disable=SC2155
|
|
local java_version=$(get_version "java")
|
|
# shellcheck disable=SC2155
|
|
local node_version=$(get_version "node")
|
|
# shellcheck disable=SC2155
|
|
local nginx_version=$(get_version "nginx")
|
|
# shellcheck disable=SC2155
|
|
local app_version=$(get_version "app-version")
|
|
# shellcheck disable=SC2155
|
|
local spring_default=$(get_version "spring-profiles-default")
|
|
# shellcheck disable=SC2155
|
|
local spring_docker=$(get_version "spring-profiles-docker")
|
|
local prometheus_version=$(get_version "prometheus")
|
|
local grafana_version=$(get_version "grafana")
|
|
local keycloak_version=$(get_version "keycloak")
|
|
local postgres_version=$(get_version "postgres")
|
|
local redis_version=$(get_version "redis")
|
|
local consul_version=$(get_version "consul")
|
|
local zookeeper_version=$(get_version "zookeeper")
|
|
local kafka_version=$(get_version "kafka")
|
|
|
|
# Update global.env
|
|
cat > "$BUILD_ARGS_DIR/global.env" << EOF
|
|
# ===================================================================
|
|
# Global Docker Build Arguments - Used by all categories
|
|
# Source: docker/versions.toml
|
|
# Last updated: $(date -u +'%Y-%m-%d %H:%M:%S UTC')
|
|
# ===================================================================
|
|
|
|
# --- Build Tools ---
|
|
GRADLE_VERSION=$gradle_version
|
|
JAVA_VERSION=$java_version
|
|
|
|
# --- Build Metadata ---
|
|
VERSION=$app_version
|
|
|
|
# --- Monitoring & Infrastructure Services ---
|
|
DOCKER_PROMETHEUS_VERSION=$prometheus_version
|
|
DOCKER_GRAFANA_VERSION=$grafana_version
|
|
DOCKER_KEYCLOAK_VERSION=$keycloak_version
|
|
|
|
# --- Datastore Images ---
|
|
DOCKER_POSTGRES_VERSION=$postgres_version
|
|
DOCKER_REDIS_VERSION=$redis_version
|
|
|
|
# --- Additional Infrastructure Images ---
|
|
DOCKER_CONSUL_VERSION=$consul_version
|
|
DOCKER_ZOOKEEPER_VERSION=$zookeeper_version
|
|
DOCKER_KAFKA_VERSION=$kafka_version
|
|
EOF
|
|
print_success "Updated global.env"
|
|
|
|
# Update clients.env
|
|
cat > "$BUILD_ARGS_DIR/clients.env" << EOF
|
|
# ===================================================================
|
|
# Clients Docker Build Arguments - dockerfiles/clients/*
|
|
# Source: docker/versions.toml [categories.clients]
|
|
# Last updated: $(date -u +'%Y-%m-%d %H:%M:%S UTC')
|
|
# ===================================================================
|
|
|
|
# --- Include Global Arguments ---
|
|
# Source global.env for GRADLE_VERSION, JAVA_VERSION, VERSION
|
|
|
|
# --- Client-Specific Build Tools ---
|
|
NODE_VERSION=$node_version
|
|
NGINX_VERSION=$nginx_version
|
|
|
|
# --- Client Build Configuration ---
|
|
CLIENT_PATH=client
|
|
CLIENT_MODULE=client
|
|
CLIENT_NAME=meldestelle-client
|
|
|
|
# --- Web Application Specific ---
|
|
WEB_APP_PORT=4000
|
|
|
|
# --- Desktop Application Specific ---
|
|
DESKTOP_APP_VNC_PORT=5901
|
|
DESKTOP_APP_NOVNC_PORT=6080
|
|
|
|
# --- Client Environment ---
|
|
NODE_ENV=production
|
|
APP_TITLE=Meldestelle
|
|
APP_VERSION=$app_version
|
|
|
|
# --- Development Configuration ---
|
|
WEBPACK_DEV_SERVER_HOST=0.0.0.0
|
|
WEBPACK_DEV_SERVER_PORT=4000
|
|
EOF
|
|
print_success "Updated clients.env"
|
|
|
|
# Update services.env
|
|
cat > "$BUILD_ARGS_DIR/services.env" << EOF
|
|
# ===================================================================
|
|
# Services Docker Build Arguments - dockerfiles/services/*
|
|
# Source: docker/versions.toml [categories.services]
|
|
# Last updated: $(date -u +'%Y-%m-%d %H:%M:%S UTC')
|
|
# ===================================================================
|
|
|
|
# --- Include Global Arguments ---
|
|
# Source global.env for GRADLE_VERSION, JAVA_VERSION, VERSION
|
|
|
|
# --- Spring Boot Services Configuration ---
|
|
SPRING_PROFILES_ACTIVE=$spring_docker
|
|
|
|
# --- Service-Specific Arguments ---
|
|
SERVICE_PATH=.
|
|
SERVICE_NAME=spring-boot-service
|
|
SERVICE_PORT=8080
|
|
|
|
# --- Service Port Mapping (matches gradle.properties) ---
|
|
PING_SERVICE_PORT=8082
|
|
MEMBERS_SERVICE_PORT=8083
|
|
HORSES_SERVICE_PORT=8084
|
|
EVENTS_SERVICE_PORT=8085
|
|
MASTERDATA_SERVICE_PORT=8086
|
|
|
|
# --- Services List (for automation scripts) ---
|
|
# ping-service, members-service, horses-service, events-service, masterdata-service
|
|
EOF
|
|
print_success "Updated services.env"
|
|
|
|
# Update infrastructure.env
|
|
cat > "$BUILD_ARGS_DIR/infrastructure.env" << EOF
|
|
# ===================================================================
|
|
# Infrastructure Docker Build Arguments - dockerfiles/infrastructure/*
|
|
# Source: docker/versions.toml [categories.infrastructure]
|
|
# Last updated: $(date -u +'%Y-%m-%d %H:%M:%S UTC')
|
|
# ===================================================================
|
|
|
|
# --- Include Global Arguments ---
|
|
# Source global.env for GRADLE_VERSION, JAVA_VERSION, VERSION
|
|
|
|
# --- Infrastructure Services Configuration ---
|
|
SPRING_PROFILES_ACTIVE=$spring_default
|
|
|
|
# --- Infrastructure Service Ports (matches gradle.properties) ---
|
|
GATEWAY_PORT=8081
|
|
AUTH_SERVER_PORT=8087
|
|
MONITORING_SERVER_PORT=8088
|
|
|
|
# --- API Gateway Specific ---
|
|
GATEWAY_SERVICE_PATH=infrastructure/gateway
|
|
GATEWAY_SERVICE_NAME=api-gateway
|
|
|
|
# --- Auth Server Specific ---
|
|
AUTH_SERVER_PATH=infrastructure/auth/auth-server
|
|
AUTH_SERVER_SERVICE_NAME=auth-server
|
|
|
|
# --- Monitoring Server Specific ---
|
|
MONITORING_SERVER_PATH=infrastructure/monitoring/monitoring-server
|
|
MONITORING_SERVER_SERVICE_NAME=monitoring-server
|
|
|
|
# --- Infrastructure Dependencies ---
|
|
CONSUL_ENABLED=true
|
|
CONSUL_HOST=consul
|
|
CONSUL_PORT=8500
|
|
|
|
# --- Database Configuration for Infrastructure Services ---
|
|
DB_HOST=postgres
|
|
DB_PORT=5432
|
|
DB_NAME=meldestelle
|
|
EOF
|
|
print_success "Updated infrastructure.env"
|
|
|
|
# --- Post-generation cleanup to enforce SSoT policies ---
|
|
# 1) Remove any accidental bare DOCKER_* placeholders from non-global envs
|
|
sed -i "/^DOCKER_[A-Z0-9_]\+$/d" "$BUILD_ARGS_DIR/services.env" || true
|
|
sed -i "/^DOCKER_[A-Z0-9_]\+$/d" "$BUILD_ARGS_DIR/infrastructure.env" || true
|
|
sed -i "/^DOCKER_[A-Z0-9_]\+$/d" "$BUILD_ARGS_DIR/clients.env" || true
|
|
|
|
# 2) Remove forbidden DOCKER_APP_VERSION from all build-args envs (it is mapped at runtime)
|
|
sed -i "/^DOCKER_APP_VERSION\(=.*\)\?$/d" "$BUILD_ARGS_DIR/global.env" || true
|
|
sed -i "/^DOCKER_APP_VERSION\(=.*\)\?$/d" "$BUILD_ARGS_DIR/clients.env" || true
|
|
sed -i "/^DOCKER_APP_VERSION\(=.*\)\?$/d" "$BUILD_ARGS_DIR/services.env" || true
|
|
sed -i "/^DOCKER_APP_VERSION\(=.*\)\?$/d" "$BUILD_ARGS_DIR/infrastructure.env" || true
|
|
|
|
# 3) Purge stray numeric service-port assignments that must not live in global.env
|
|
# e.g., lines like: prometheus = 9090
|
|
sed -i -E "/^[a-z_]+ = [0-9]+$/d" "$BUILD_ARGS_DIR/global.env" || true
|
|
|
|
print_success "All environment files synced successfully!"
|
|
}
|
|
|
|
# Function to show current versions
|
|
show_current_versions() {
|
|
print_info "Current Docker versions:"
|
|
echo " Gradle: $(get_version "gradle")"
|
|
echo " Java: $(get_version "java")"
|
|
echo " Node.js: $(get_version "node")"
|
|
echo " Nginx: $(get_version "nginx")"
|
|
echo " Alpine: $(get_version "alpine")"
|
|
echo " Prometheus: $(get_version "prometheus")"
|
|
echo " Grafana: $(get_version "grafana")"
|
|
echo " Keycloak: $(get_version "keycloak")"
|
|
echo " App Version: $(get_version "app-version")"
|
|
echo " Spring Profile (Default): $(get_version "spring-profiles-default")"
|
|
echo " Spring Profile (Docker): $(get_version "spring-profiles-docker")"
|
|
}
|
|
|
|
# Function to show help
|
|
show_help() {
|
|
echo "Docker Versions Update Utility"
|
|
echo ""
|
|
echo "Usage: $0 [COMMAND] [OPTIONS]"
|
|
echo ""
|
|
echo "Commands:"
|
|
echo " show Show current versions"
|
|
echo " sync Sync versions.toml to environment files"
|
|
echo " update <key> <version> Update specific version"
|
|
echo ""
|
|
echo "Available keys for update:"
|
|
echo " gradle Gradle version"
|
|
echo " java Java version"
|
|
echo " node Node.js version"
|
|
echo " nginx Nginx version"
|
|
echo " alpine Alpine Linux version"
|
|
echo " prometheus Prometheus version"
|
|
echo " grafana Grafana version"
|
|
echo " keycloak Keycloak version"
|
|
echo " app-version Application version"
|
|
echo " spring-profiles-default Default Spring profile"
|
|
echo " spring-profiles-docker Docker Spring profile"
|
|
echo ""
|
|
echo "Examples:"
|
|
echo " $0 show # Show current versions"
|
|
echo " $0 update gradle 9.1.0 # Update Gradle to 9.1.0"
|
|
echo " $0 update java 22 # Update Java to version 22"
|
|
echo " $0 sync # Sync versions to environment files"
|
|
echo ""
|
|
echo "After updating versions, run 'sync' to update environment files"
|
|
echo "or use scripts/docker-build.sh to build with new versions."
|
|
}
|
|
|
|
# Main execution
|
|
main() {
|
|
# Check if versions.toml exists
|
|
if [[ ! -f "$VERSIONS_TOML" ]]; then
|
|
print_error "Versions file not found: $VERSIONS_TOML"
|
|
exit 1
|
|
fi
|
|
|
|
case $1 in
|
|
"show")
|
|
show_current_versions
|
|
;;
|
|
"sync")
|
|
sync_to_env_files
|
|
;;
|
|
"update")
|
|
if [[ $# -lt 3 ]]; then
|
|
print_error "Usage: $0 update <key> <version>"
|
|
exit 1
|
|
fi
|
|
update_version "$2" "$3"
|
|
sync_to_env_files
|
|
;;
|
|
"-h"|"--help"|"help")
|
|
show_help
|
|
;;
|
|
"")
|
|
print_error "No command specified"
|
|
show_help
|
|
exit 1
|
|
;;
|
|
*)
|
|
print_error "Unknown command: $1"
|
|
show_help
|
|
exit 1
|
|
;;
|
|
esac
|
|
}
|
|
|
|
# Run main function with all arguments
|
|
main "$@"
|