From 16d3f46e887c8e74150c3221d7a89f521544e005 Mon Sep 17 00:00:00 2001 From: StefanMoCoAt Date: Tue, 3 Mar 2026 21:53:38 +0100 Subject: [PATCH] Final fix: remove typo and hardcode registry paths --- .gitea/workflows/docker-publish.yaml | 55 ++++++++-------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/.gitea/workflows/docker-publish.yaml b/.gitea/workflows/docker-publish.yaml index aec03911..0dadeb65 100644 --- a/.gitea/workflows/docker-publish.yaml +++ b/.gitea/workflows/docker-publish.yaml @@ -5,26 +5,14 @@ on: branches: [ "main" ] paths: - 'backend/**' - - 'platform/**' - 'core/**' - 'frontend/**' - 'config/docker/**' - - 'build.gradle.kts' - - 'settings.gradle.kts' - - 'gradle.properties' - 'docker-compose.yaml' - '.gitea/workflows/docker-publish.yaml' -env: - REGISTRY: git.mo-code.at - IMAGE_PREFIX: mocode-software/meldestelle - JAVA_VERSION: '25' - GRADLE_VERSION: '9.3.1' - # Optimierte JVM Flags für den ARM-Runner - JVM_OPTS_ARM64: "-XX:ActiveProcessorCount=8 -XX:+UseG1GC -XX:+UseTransparentHugePages -XX:+UseSVE=1" - jobs: - # JOB 1: Backend Services & Keycloak + # JOB 1: Backend & Keycloak (Kein schwerer JS-Build) build-backend: runs-on: ubuntu-latest strategy: @@ -45,42 +33,32 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: ${{ env.JAVA_VERSION }} + java-version: '25' distribution: 'temurin' - - name: Setup Gradle Cache - uses: actions/cache@v4 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-backend-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - - name: Set up Docker Buildx uses: actions/setup-buildx-action@v3 - - name: Log in to the Container registry + - name: Log in to Registry uses: docker/login-action@v3 with: - registry: ${{ env.REGISTRY }} + registry: git.mo-code.at username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_TOKEN }} - - name: Build and push Backend Image + - name: Build and push uses: docker/build-push-action@v5 with: context: . file: ${{ matrix.dockerfile }} push: true - # Hier war der Fehler: Jetzt korrekt auf env.REGISTRY - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/${{ matrix.service }}:latest + tags: git.mo-code.at/mocode-software/meldestelle/${{ matrix.service }}:latest build-args: | - GRADLE_VERSION=${{ env.GRADLE_VERSION }} - JAVA_VERSION=${{ env.JAVA_VERSION }} - JVM_OPTS_APPEND=${{ env.JVM_OPTS_ARM64 }} - DOCKER_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') + GRADLE_VERSION=9.3.1 + JAVA_VERSION=25 + JVM_OPTS_APPEND=-XX:ActiveProcessorCount=8 -XX:+UseG1GC -XX:+UseSVE=1 - # JOB 2: Das speicherintensive Frontend (Web-App) + # JOB 2: Frontend (Eigener Job für maximalen RAM) build-frontend: runs-on: ubuntu-latest steps: @@ -90,13 +68,12 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: ${{ env.JAVA_VERSION }} + java-version: '25' distribution: 'temurin' - - name: Build Frontend (Kotlin JS) + - name: Build JS Frontend run: | chmod +x gradlew - # Reduzierte Worker, um den RAM (10GB) nicht zu sprengen ./gradlew :frontend:shells:meldestelle-portal:jsBrowserDistribution \ -Pproduction=true \ --max-workers=4 \ @@ -106,17 +83,17 @@ jobs: - name: Set up Docker Buildx uses: actions/setup-buildx-action@v3 - - name: Log in to the Container registry + - name: Log in to Registry uses: docker/login-action@v3 with: - registry: ${{ env.REGISTRY }} + registry: git.mo-code.at username: ${{ secrets.REGISTRY_USER }} password: ${{ secrets.REGISTRY_TOKEN }} - - name: Build and push Web-App Image + - name: Build and push Web-App uses: docker/build-push-action@v5 with: context: . file: config/docker/caddy/web-app/Dockerfile push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_PREFIX }}/web-app:latest + tags: git.mo-code.at/mocode-software/meldestelle/web-app:latest