siplify workflow

.gitea/workflows/docker-builder.yml

@@ -120,20 +120,13 @@ jobs:
 
       - name: Compute Docker tags
         run: |
-          TAGS="${IMAGE_NAME}:${VERSION}"
-
           if [[ "$IS_TAG" == "true" ]]; then
-            MAJOR=$(echo $CLEAN_VERSION | cut -d. -f1)
+            DOCKER_TAGS="${IMAGE_NAME}:${VERSION},${IMAGE_NAME}:latest"
-            MINOR=$(echo $CLEAN_VERSION | cut -d. -f1,2)
-
-            TAGS="$TAGS,${IMAGE_NAME}:${MINOR}"
-            TAGS="$TAGS,${IMAGE_NAME}:${MAJOR}"
-            TAGS="$TAGS,${IMAGE_NAME}:latest"
           else
-            TAGS="$TAGS,${IMAGE_NAME}:main"
+            DOCKER_TAGS="${IMAGE_NAME}:main"
           fi
 
-          echo "DOCKER_TAGS=$TAGS" >> $GITEA_ENV
+          echo "DOCKER_TAGS=$DOCKER_TAGS" >> $GITEA_ENV
 
       - name: Load versions.env safely
         shell: bash
@@ -153,7 +146,6 @@ jobs:
           parse_env
 
           # Fixen von Workflow-Variablen
-          VERSION="$GITHUB_REF_NAME"
           CLEAN_VERSION="${VERSION#v}"
           BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)
 
@@ -208,10 +200,11 @@ jobs:
             -t ${CACHE_IMAGE_NAME}:${VERSION}-arm64 \
             --push .
 
-          docker buildx imagetools create \
+          for TAG in $(echo $DOCKER_TAGS | tr ',' ' '); do
-            -t ${IMAGE_NAME}:${VERSION} \
+            docker buildx imagetools create -t $TAG \
               ${CACHE_IMAGE_NAME}:${VERSION}-amd64 \
               ${CACHE_IMAGE_NAME}:${VERSION}-arm64
+          done
 
           echo "== Multiarch Build Complete =="
 
@@ -242,5 +235,3 @@ jobs:
         if: env.IS_TAG == 'true'
         run: |
           cosign sign --key ${{ secrets.COSIGN_KEY }} ${IMAGE_NAME}:${VERSION}
-
-

.gitea/workflows/promote.yml

@@ -1,35 +0,0 @@
-name: Promote Edge To Release
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-env:
-  REGISTRY_HOST: git.pi-farm.de
-  IMAGE_BASE: ${{ gitea.repository }}
-
-jobs:
-  promote:
-    runs-on: buildx-multiarch
-
-    steps:
-      - name: Extract version
-        run: |
-          VERSION="${GITHUB_REF_NAME#v}"
-          echo "VERSION=$VERSION" >> $GITEA_ENV
-          echo "IMAGE=${REGISTRY_HOST}/${IMAGE_BASE}" >> $GITEA_ENV
-
-      - name: Login registry
-        run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login \
-            ${{ env.REGISTRY_HOST }} -u ${{ secrets.REGISTRY_USER }} --password-stdin
-
-      - name: Promote edge image
-        run: |
-          docker buildx imagetools create \
-            -t ${IMAGE}:v${VERSION} \
-            -t ${IMAGE}:${VERSION%.*} \
-            -t ${IMAGE}:${VERSION%%.*} \
-            -t ${IMAGE}:latest \
-            ${IMAGE}:edge