.gitea/workflows/build.yml aktualisiert

.gitea/workflows/build.yml

@@ -30,7 +30,6 @@ jobs:
     steps:
       - name: Prepare environment
         run: |
-          # Extrahiert die reine Domain/Host aus der Gitea-URL
           REGISTRY_HOST=$(echo "${{ github.server_url }}" | awk -F/ '{print $3}')
           OWNER_LOWER="${{ github.repository_owner }}"
           NAME_LOWER="${{ env.IMAGE_NAME }}"
@@ -39,18 +38,6 @@ jobs:
           echo "IMAGE_REGISTRY=${REGISTRY_HOST}/${OWNER_LOWER,,}" >> ${GITHUB_ENV}
           echo "IMAGE_NAME=${NAME_LOWER,,}" >> ${GITHUB_ENV}
 
-      - name: Determine image tag
-        run: |
-          BRANCH="${GITHUB_REF_NAME}"
-          if [[ "$BRANCH" == "main" ]]; then
-            echo "IMAGE_TAG=${DEFAULT_TAG}" >> ${GITHUB_ENV}
-            echo "IS_TEST_BUILD=false" >> ${GITHUB_ENV}
-          else
-            SANITIZED=$(echo "$BRANCH" | sed 's/[^a-zA-Z0-9._-]/-/g' | head -c 50)
-            echo "IMAGE_TAG=test-${SANITIZED}" >> ${GITHUB_ENV}
-            echo "IS_TEST_BUILD=true" >> ${GITHUB_ENV}
-          fi
-
       - name: Checkout
         uses: actions/checkout@v7.0.1
 
@@ -63,11 +50,11 @@ jobs:
         with:
           images: ${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            type=raw,value=${{ env.IMAGE_TAG }}
+            type=raw,value=${{ env.DEFAULT_TAG }},enable=${{ github.ref_name == 'main' }}
-            type=raw,value=${{ env.IMAGE_TAG }}.{{date 'YYYYMMDD'}},enable=${{ env.IS_TEST_BUILD == 'false' }}
+            type=raw,value=${{ env.DEFAULT_TAG }}.{{date 'YYYYMMDD'}},enable=${{ github.ref_name == 'main' }}
-            type=raw,value={{date 'YYYYMMDD'}},enable=${{ env.IS_TEST_BUILD == 'false' }}
+            type=raw,value={{date 'YYYYMMDD'}},enable=${{ github.ref_name == 'main' }}
-            type=sha,enable=${{ github.event_name == 'pull_request' }}
+            type=raw,value=test-{{branch}},enable=${{ github.ref_name != 'main' && github.event_name != 'pull_request' }}
-            type=ref,event=pr
+            type=ref,event=pr,prefix=test-pr-
           labels: |
             org.opencontainers.image.created={{date 'YYYY-MM-DDTHH:mm:ssZ'}}
             org.opencontainers.image.description=${{ env.IMAGE_DESC }}
@@ -76,7 +63,6 @@ jobs:
             org.opencontainers.image.title=${{ env.IMAGE_NAME }}
             org.opencontainers.image.url=${{ github.server_url }}/${{ github.repository }}
             org.opencontainers.image.vendor=${{ github.repository_owner }}
-            org.opencontainers.image.version=${{ env.IMAGE_TAG }}.{{date 'YYYYMMDD'}}
             containers.bootc=1
             ostree.bootable=1
 
@@ -97,39 +83,29 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.metadata.outputs.tags }}
           labels: ${{ steps.metadata.outputs.labels }}
-          # 1. Build-Cache aus der Registry laden & schreiben
+          oci-mediatypes: true
-          cache-from: type=registry,ref=${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache
+          compression: zstd
-          cache-to: type=registry,ref=${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache,mode=max
-          # 2. OCI-Format & Zstd-Kompression für zstd:chunked Range-Requests aktivieren
-          outputs: type=registry,push=true,oci-mediatypes=true,compression=zstd
 
       - name: Install envsubst dependencies
-        if: github.event_name != 'pull_request' && env.IS_TEST_BUILD == 'false'
+        if: github.event_name != 'pull_request' && github.ref_name == 'main'
         run: |
           sudo apt-get update && sudo apt-get install -y gettext
 
       - name: Install Cosign
-        if: github.event_name != 'pull_request' && env.IS_TEST_BUILD == 'false'
+        if: github.event_name != 'pull_request' && github.ref_name == 'main'
         uses: sigstore/cosign-installer@v4.1.2
 
-      - name: Sign container image (Recursive Digest)
+      - name: Sign container image
-        if: github.event_name != 'pull_request' && env.IS_TEST_BUILD == 'false'
+        if: github.event_name != 'pull_request' && github.ref_name == 'main'
         env:
           COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }}
           COSIGN_PASSWORD: ""
         run: |
-          # 1. Cosign an der Gitea-Registry anmelden
           echo "${{ secrets.REGISTRY }}" | cosign login "${{ env.REGISTRY_HOST }}" -u "${{ github.repository_owner }}" --password-stdin
-          
+
-          # 2. Skopeo als Docker-Container ausführen, um den Digest zu holen
+          IMAGE_REF="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build_image.outputs.digest }}"
-          echo "Frage finalen Manifest-List-Digest via Skopeo-Container ab..."
+          echo "Signiere Manifest via Direct Digest: ${IMAGE_REF}"
-          OUTER_DIGEST=$(docker run --rm quay.io/skopeo/stable inspect --creds "${{ github.repository_owner }}:${{ secrets.REGISTRY }}" docker://${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:stable | jq -r .Digest)
+
-          
-          # 3. Die Referenz über den äußeren Digest bauen
-          IMAGE_REF="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}@${OUTER_DIGEST}"
-          echo "Signiere Manifest-List und alle Sub-Architekturen rekursiv via Digest: ${IMAGE_REF}"
-          
-          # 4. Signatur rekursiv auf Gitea pushen (ohne deprecated tlog-Flag)
           cosign sign -y \
             --key env://COSIGN_PRIVATE_KEY \
             --recursive \
@@ -137,9 +113,9 @@ jobs:
             --new-bundle-format=false \
             --registry-referrers-mode=legacy \
             "${IMAGE_REF}"
-          
+
       - name: Post-Build Cleanup
         if: always()
         run: |
-          echo "Versuche Buildx-internen Cache zu leeren..."
+          echo "Leere Buildx-internen Cache..."
-          docker buildx prune -a -f || true
+          docker buildx prune -a -f || true