From 9e684060ca2e2c67c8f1407a6c9da7ca0bef5abc Mon Sep 17 00:00:00 2001 From: Sebas Date: Wed, 24 Jun 2026 08:23:01 +0000 Subject: [PATCH] release: Multi-Arch (amd64 + arm64) via buildx, HTTP- und stdio-Image --- .gitea/workflows/release.yml | 83 +++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 9417b24..9ff59c4 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -1,13 +1,16 @@ -name: Release Image +name: Release Images -# Baut das Container-Image und haengt es als .tar.gz an den Release. -# Ablauf: in Gitea einen Release (Tag z.B. v0.1.0) veroeffentlichen -> -# dieser Workflow baut das Image, `docker save`t es und laedt es als Asset -# an genau diesen Release. Download = simpler HTTPS-GET -> auf dem Laptop -# `podman load < dtrack-mcp-.tar.gz`. +# Baut die Container-Images und haengt sie als .tar.gz an den Release. +# Pro Asset: docker save | gzip -> Gitea-Release-Asset (Download = HTTPS-GET, +# auf der Zielmaschine `docker load < .tar.gz`). # -# Spiegelt den bewaehrten Godforge/deploy.yml-Stil (host-Runner, docker-cli, -# curl+jq gegen die Gitea-API mit secrets.GITEATOKEN). +# Multi-Arch via buildx + QEMU: +# - dtrack-stdio amd64 (Arbeits-Notebook) +# - dtrack-http amd64 ("nicht Mac" / Intel) +# - dtrack-http arm64 (Apple Silicon Mac) +# +# Spiegelt den Godforge/deploy.yml-Stil (host-Runner, curl+jq, secrets.GITEATOKEN). +# Hinweis: braucht das buildx-Plugin und privilegiertes QEMU-binfmt fuer arm64. on: release: @@ -24,7 +27,7 @@ jobs: steps: - name: Install deps - run: apk add --no-cache curl jq docker-cli git + run: apk add --no-cache curl jq git docker-cli docker-cli-buildx - name: Checkout uses: actions/checkout@v4 @@ -38,52 +41,52 @@ jobs: echo "tag=${{ inputs.tag }}" >> $GITHUB_OUTPUT fi - - name: Build image - run: | - TAG="${{ steps.vars.outputs.tag }}" - docker build -f Containerfile -t "dtrack-mcp:${TAG}" . + - name: Setup QEMU (arm64-Cross-Build) + run: docker run --privileged --rm tonistiigi/binfmt --install arm64 - - name: Save image as tarball + - name: Setup buildx run: | - TAG="${{ steps.vars.outputs.tag }}" - docker save "dtrack-mcp:${TAG}" | gzip > "dtrack-mcp-${TAG}.tar.gz" - ls -lh "dtrack-mcp-${TAG}.tar.gz" + docker buildx create --name dtrackbuilder --use 2>/dev/null || docker buildx use dtrackbuilder + docker buildx inspect --bootstrap - - name: Attach tarball to release + - name: Build, save & attach run: | + set -eu TAG="${{ steps.vars.outputs.tag }}" - FILE="dtrack-mcp-${TAG}.tar.gz" REPO="${{ gitea.repository }}" + API="https://git.sithies.de/api/v1/repos/${REPO}/releases" + AUTH="Authorization: token ${{ secrets.GITEATOKEN }}" - REL_ID=$(curl -s \ - "https://git.sithies.de/api/v1/repos/${REPO}/releases/tags/${TAG}" \ - -H "Authorization: token ${{ secrets.GITEATOKEN }}" \ - | jq -r '.id') - + REL_ID=$(curl -s "${API}/tags/${TAG}" -H "$AUTH" | jq -r '.id') if [ -z "$REL_ID" ] || [ "$REL_ID" = "null" ]; then echo "ERROR: Kein Release fuer Tag ${TAG} gefunden. Erst Release veroeffentlichen." exit 1 fi - # Vorhandenes Asset gleichen Namens entfernen (idempotente Re-Runs). - OLD_ID=$(curl -s \ - "https://git.sithies.de/api/v1/repos/${REPO}/releases/${REL_ID}/assets" \ - -H "Authorization: token ${{ secrets.GITEATOKEN }}" \ - | jq -r --arg n "$FILE" '.[] | select(.name == $n) | .id') - if [ -n "$OLD_ID" ] && [ "$OLD_ID" != "null" ]; then - curl -s -X DELETE \ - "https://git.sithies.de/api/v1/repos/${REPO}/releases/${REL_ID}/assets/${OLD_ID}" \ - -H "Authorization: token ${{ secrets.GITEATOKEN }}" - fi + build_one() { + name="$1"; file="$2"; platform="$3"; suffix="$4" + img="${name}:${TAG}-${suffix}" + out="${name}-${TAG}-${suffix}.tar.gz" + echo ">> baue ${img} (${platform})" + docker buildx build --platform "$platform" -f "$file" -t "$img" --load . + docker save "$img" | gzip > "$out" - curl -sf -X POST \ - "https://git.sithies.de/api/v1/repos/${REPO}/releases/${REL_ID}/assets?name=${FILE}" \ - -H "Authorization: token ${{ secrets.GITEATOKEN }}" \ - -F "attachment=@${FILE}" \ - && echo "Asset ${FILE} an Release ${TAG} angehaengt." + OLD_ID=$(curl -s "${API}/${REL_ID}/assets" -H "$AUTH" \ + | jq -r --arg n "$out" '.[] | select(.name == $n) | .id') + if [ -n "$OLD_ID" ] && [ "$OLD_ID" != "null" ]; then + curl -s -X DELETE "${API}/${REL_ID}/assets/${OLD_ID}" -H "$AUTH" + fi + + curl -sf -X POST "${API}/${REL_ID}/assets?name=${out}" -H "$AUTH" \ + -F "attachment=@${out}" && echo " angehaengt: ${out}" + } + + build_one dtrack-stdio Containerfile linux/amd64 amd64 + build_one dtrack-http Containerfile.http linux/amd64 amd64 + build_one dtrack-http Containerfile.http linux/arm64 arm64 - name: Cleanup if: always() run: | - docker image rm "dtrack-mcp:${{ steps.vars.outputs.tag }}" 2>/dev/null || true + docker buildx rm dtrackbuilder 2>/dev/null || true apk del jq 2>/dev/null || true