From fbda6ecacc5072f920d63dfac91a9e202aa3b0e3 Mon Sep 17 00:00:00 2001 From: Patrick Asmus Date: Sun, 22 Nov 2026 03:05:42 +0100 Subject: [PATCH] =?UTF-8?q?Workflow:=20Multi-Arch-Build=20(amd64=20+=20arm?= =?UTF-8?q?64)=20=C3=BCber=20beide=20Runner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Das Image wird jetzt nativ auf gitrunner-sv09 (linux-amd64) und gitrunner-vps02 (linux-arm64) gebaut, nur per Digest gepusht und danach mit docker buildx imagetools zu einem Manifest für latest und den Versions-Tag zusammengefasst. Es gibt keine -amd64/-arm64 Tags. Der Update-Check fragt das Manifest jetzt auch mit den Index- und Listen-Typen ab, sonst würde ein Multi-Arch-Image nicht gefunden und jeden Abend neu gebaut. Co-Authored-By: Claude Opus 5.5 --- .gitea/workflows/daily-docker.yml | 195 ++++++++++++++++++++++++------ 1 file changed, 160 insertions(+), 35 deletions(-) diff --git a/.gitea/workflows/daily-docker.yml b/.gitea/workflows/daily-docker.yml index 83de406..db4df56 100644 --- a/.gitea/workflows/daily-docker.yml +++ b/.gitea/workflows/daily-docker.yml @@ -1,5 +1,8 @@ -# VDO.Ninja Docker - Daily Build -# Prüft täglich um 20:00 Uhr (MESZ) auf Updates und baut ein neues Docker Image +# VDO.Ninja Docker - Daily Build (Multi-Arch) +# Prüft täglich um 20:00 Uhr (MESZ) auf Updates und baut ein neues Docker Image. +# Gebaut wird nativ auf beiden Runnern (amd64 auf gitrunner-sv09, arm64 auf +# gitrunner-vps02). Die Plattform-Images werden nur per Digest gepusht (ohne +# -amd64/-arm64 Tags) und anschließend zu einem Multi-Arch-Manifest zusammengefasst. # Quelle: https://github.com/steveseguin/vdo.ninja name: Daily Docker Build @@ -15,16 +18,15 @@ env: UPSTREAM_REPO: https://github.com/steveseguin/vdo.ninja jobs: - check-and-build: - name: Update-Check & Build - runs-on: ubuntu-latest + check: + name: Update-Check + runs-on: linux-amd64 + outputs: + should_build: ${{ steps.check.outputs.should_build }} + upstream_tag: ${{ steps.check.outputs.upstream_tag }} + registry: ${{ steps.check.outputs.registry }} steps: - - name: Checkout Repository - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - name: Auf VDO.Ninja Updates prüfen id: check run: | @@ -42,54 +44,177 @@ jobs: REGISTRY="${REGISTRY#http://}" echo "registry=${REGISTRY}" >> "$GITHUB_OUTPUT" - # Prüfen ob ein Image mit diesem Versions-Tag bereits existiert + # Prüfen ob ein Image mit diesem Versions-Tag bereits existiert. + # Accept enthält auch die Index-/Listen-Typen, sonst wird ein Multi-Arch-Manifest + # nicht gefunden und es würde täglich neu gebaut. HTTP_CODE=$(curl -s -o /dev/null -w "%{http_code}" \ -u "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_TOKEN }}" \ "${{ vars.REGISTRY_URL }}/v2/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}/manifests/${UPSTREAM_TAG}" \ + -H "Accept: application/vnd.oci.image.index.v1+json" \ + -H "Accept: application/vnd.docker.distribution.manifest.list.v2+json" \ + -H "Accept: application/vnd.oci.image.manifest.v1+json" \ -H "Accept: application/vnd.docker.distribution.manifest.v2+json" 2>/dev/null || echo "000") if [ "$HTTP_CODE" = "200" ] && [ "${{ github.event_name }}" != "workflow_dispatch" ]; then echo "Image mit Version ${UPSTREAM_TAG} existiert bereits. Build wird übersprungen." echo "should_build=false" >> "$GITHUB_OUTPUT" else - echo "Neue Version ${UPSTREAM_TAG} erkannt. Image wird gebaut." + echo "Neue Version ${UPSTREAM_TAG} erkannt (oder manueller Start). Image wird gebaut." echo "should_build=true" >> "$GITHUB_OUTPUT" fi + build-amd64: + name: Build amd64 + needs: check + if: needs.check.outputs.should_build == 'true' + runs-on: linux-amd64 + outputs: + digest: ${{ steps.push.outputs.digest }} + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Bei Gitea Registry einloggen - if: steps.check.outputs.should_build == 'true' run: | echo "${{ secrets.REGISTRY_TOKEN }}" | \ - docker login ${{ steps.check.outputs.registry }} \ + docker login ${{ needs.check.outputs.registry }} \ --username "${{ secrets.REGISTRY_USER }}" \ --password-stdin - - name: Docker Image bauen - if: steps.check.outputs.should_build == 'true' + - name: Buildx-Builder anlegen run: | + BUILDER="vdo-ninja-${GITHUB_RUN_ID}-amd64" + echo "BUILDER=${BUILDER}" >> "$GITHUB_ENV" + docker buildx create --name "${BUILDER}" --driver docker-container + docker buildx inspect --bootstrap "${BUILDER}" + + - name: Build & Push per Digest (linux/amd64) + id: push + run: | + IMAGE="${{ needs.check.outputs.registry }}/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}" docker buildx build \ + --builder "${BUILDER}" \ + --platform "linux/amd64" \ + --pull \ --provenance=false \ --sbom=false \ --build-arg VDO_NINJA_REPO=${{ env.UPSTREAM_REPO }} \ - --build-arg VDO_NINJA_REF=${{ steps.check.outputs.upstream_tag }} \ - -t ${{ steps.check.outputs.registry }}/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}:latest \ - -t ${{ steps.check.outputs.registry }}/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}:${{ steps.check.outputs.upstream_tag }} \ - --push \ + --build-arg VDO_NINJA_REF=${{ needs.check.outputs.upstream_tag }} \ + --label org.opencontainers.image.source="https://git.techniverse.net/scriptos/vdo.ninja-docker" \ + --label org.opencontainers.image.version="${{ needs.check.outputs.upstream_tag }}" \ + --label org.opencontainers.image.revision="${GITHUB_SHA}" \ + --output "type=image,name=${IMAGE},push-by-digest=true,name-canonical=true,push=true" \ + --metadata-file /tmp/metadata.json \ . - - name: Build-Zusammenfassung - if: always() - run: | - if [ "${{ steps.check.outputs.should_build }}" = "true" ]; then - echo "### Docker Build Zusammenfassung" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "| Eigenschaft | Wert |" >> $GITHUB_STEP_SUMMARY - echo "|---|---|" >> $GITHUB_STEP_SUMMARY - echo "| **Image** | \`${{ env.IMAGE_NAME }}\` |" >> $GITHUB_STEP_SUMMARY - echo "| **VDO.Ninja Version** | \`${{ steps.check.outputs.upstream_tag }}\` |" >> $GITHUB_STEP_SUMMARY - echo "| **Tags** | \`latest\`, \`${{ steps.check.outputs.upstream_tag }}\` |" >> $GITHUB_STEP_SUMMARY - else - echo "### Kein Update erforderlich" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "VDO.Ninja Version \`${{ steps.check.outputs.upstream_tag }}\` ist bereits als Image vorhanden." >> $GITHUB_STEP_SUMMARY + DIGEST=$(jq -r '."containerimage.digest"' /tmp/metadata.json) + if [ -z "${DIGEST}" ] || [ "${DIGEST}" = "null" ]; then + echo "::error::Kein Digest im Build-Ergebnis gefunden" + exit 1 fi + echo "Digest amd64: ${DIGEST}" + echo "digest=${DIGEST}" >> "$GITHUB_OUTPUT" + + - name: Buildx-Builder entfernen + if: always() + run: docker buildx rm "${BUILDER}" || true + + build-arm64: + name: Build arm64 + needs: check + if: needs.check.outputs.should_build == 'true' + runs-on: linux-arm64 + outputs: + digest: ${{ steps.push.outputs.digest }} + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Bei Gitea Registry einloggen + run: | + echo "${{ secrets.REGISTRY_TOKEN }}" | \ + docker login ${{ needs.check.outputs.registry }} \ + --username "${{ secrets.REGISTRY_USER }}" \ + --password-stdin + + - name: Buildx-Builder anlegen + run: | + BUILDER="vdo-ninja-${GITHUB_RUN_ID}-arm64" + echo "BUILDER=${BUILDER}" >> "$GITHUB_ENV" + docker buildx create --name "${BUILDER}" --driver docker-container + docker buildx inspect --bootstrap "${BUILDER}" + + - name: Build & Push per Digest (linux/arm64) + id: push + run: | + IMAGE="${{ needs.check.outputs.registry }}/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}" + docker buildx build \ + --builder "${BUILDER}" \ + --platform "linux/arm64" \ + --pull \ + --provenance=false \ + --sbom=false \ + --build-arg VDO_NINJA_REPO=${{ env.UPSTREAM_REPO }} \ + --build-arg VDO_NINJA_REF=${{ needs.check.outputs.upstream_tag }} \ + --label org.opencontainers.image.source="https://git.techniverse.net/scriptos/vdo.ninja-docker" \ + --label org.opencontainers.image.version="${{ needs.check.outputs.upstream_tag }}" \ + --label org.opencontainers.image.revision="${GITHUB_SHA}" \ + --output "type=image,name=${IMAGE},push-by-digest=true,name-canonical=true,push=true" \ + --metadata-file /tmp/metadata.json \ + . + + DIGEST=$(jq -r '."containerimage.digest"' /tmp/metadata.json) + if [ -z "${DIGEST}" ] || [ "${DIGEST}" = "null" ]; then + echo "::error::Kein Digest im Build-Ergebnis gefunden" + exit 1 + fi + echo "Digest arm64: ${DIGEST}" + echo "digest=${DIGEST}" >> "$GITHUB_OUTPUT" + + - name: Buildx-Builder entfernen + if: always() + run: docker buildx rm "${BUILDER}" || true + + manifest: + name: Multi-Arch-Manifest + needs: [check, build-amd64, build-arm64] + runs-on: linux-amd64 + + steps: + - name: Bei Gitea Registry einloggen + run: | + echo "${{ secrets.REGISTRY_TOKEN }}" | \ + docker login ${{ needs.check.outputs.registry }} \ + --username "${{ secrets.REGISTRY_USER }}" \ + --password-stdin + + - name: Manifest erstellen (latest + Versions-Tag) + env: + DIGEST_AMD64: ${{ needs.build-amd64.outputs.digest }} + DIGEST_ARM64: ${{ needs.build-arm64.outputs.digest }} + run: | + IMAGE="${{ needs.check.outputs.registry }}/${{ secrets.REGISTRY_USER }}/${{ env.IMAGE_NAME }}" + TAG="${{ needs.check.outputs.upstream_tag }}" + if [ -z "${DIGEST_AMD64}" ] || [ -z "${DIGEST_ARM64}" ]; then + echo "::error::Digest fehlt (amd64='${DIGEST_AMD64}', arm64='${DIGEST_ARM64}')" + exit 1 + fi + docker buildx imagetools create \ + -t "${IMAGE}:latest" \ + -t "${IMAGE}:${TAG}" \ + "${IMAGE}@${DIGEST_AMD64}" \ + "${IMAGE}@${DIGEST_ARM64}" + docker buildx imagetools inspect "${IMAGE}:${TAG}" + + - name: Build-Zusammenfassung + run: | + echo "### Docker Build Zusammenfassung" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "| Eigenschaft | Wert |" >> $GITHUB_STEP_SUMMARY + echo "|---|---|" >> $GITHUB_STEP_SUMMARY + echo "| **Image** | \`${{ env.IMAGE_NAME }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| **VDO.Ninja Version** | \`${{ needs.check.outputs.upstream_tag }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| **Plattformen** | \`linux/amd64\`, \`linux/arm64\` |" >> $GITHUB_STEP_SUMMARY + echo "| **Tags** | \`latest\`, \`${{ needs.check.outputs.upstream_tag }}\` |" >> $GITHUB_STEP_SUMMARY