改用常驻 Runner 发布镜像

Reviewed-on: #16

.gitea/workflows/publish-images.yml

@@ -17,10 +17,14 @@ on:
 jobs:
   publish-images:
     name: publish-images
-    runs-on: [self-hosted, pod]
+    runs-on: self-hosted
     timeout-minutes: 45
     permissions:
       contents: read
+    container:
+      image: docker.io/gitea/runner-images:ubuntu-latest@sha256:fd911d7417bfbf0f454530e447da95b58001e1df41bbc5e1a8dd35d432575aae
+      volumes:
+        - /run/spire/agent-sockets:/run/spire/agent-sockets:ro
     env:
       PUSH_REGISTRY: zot-push.ad.ddupan.top
       PULL_REGISTRY: zot.ad.ddupan.top
@@ -41,28 +45,18 @@ jobs:
           apt-get install --yes --no-install-recommends shellcheck
           shellcheck scripts/*
 
-      - name: Start Docker
+      - name: Fetch pinned SPIRE CLI
         shell: bash
         run: |
           set -euo pipefail
-          # The runner Pod itself uses an overlay filesystem. A nested overlay
+          archive=/tmp/spire.tar.gz
-          # snapshotter cannot mount there, so use the copy-based vfs driver.
+          curl --fail --location --silent --show-error \
-          dockerd \
+            --output "$archive" \
-            --storage-driver=vfs \
+            https://github.com/spiffe/spire/releases/download/v1.15.3/spire-1.15.3-linux-amd64-musl.tar.gz
-            --feature containerd-snapshotter=false \
+          printf '%s  %s\n' \
-            >/tmp/dockerd.log 2>&1 &
+            ca1a4d1155317bdd2afc7f36663828a10410c7c840e54725b90b4064b0a301c7 \
-          for _ in $(seq 1 60); do
+            "$archive" | sha256sum --check --status
-            if docker info >/dev/null 2>&1; then
+          tar -xzf "$archive" -C /tmp spire-1.15.3/bin/spire-agent
-              exit 0
-            fi
-            if ! kill -0 "$!" 2>/dev/null; then
-              cat /tmp/dockerd.log >&2
-              exit 1
-            fi
-            sleep 1
-          done
-          cat /tmp/dockerd.log >&2
-          exit 1
 
       - name: Build and publish
         shell: bash
@@ -74,15 +68,14 @@ jobs:
           image_tag="sha-${GITHUB_SHA}"
           docker_config=$(mktemp -d)
           jwt_file=$(mktemp)
-          buildkit_config=$(mktemp)
           cleanup() {
             docker buildx rm ci-builder >/dev/null 2>&1 || true
-            rm -rf -- "$docker_config" "$jwt_file" "$buildkit_config"
+            rm -rf -- "$docker_config" "$jwt_file"
           }
           trap cleanup EXIT
           export DOCKER_CONFIG="$docker_config"
 
-          /opt/spire/bin/spire-agent api fetch jwt \
+          /tmp/spire-1.15.3/bin/spire-agent api fetch jwt \
             -audience zot \
             -socketPath "$SPIRE_AGENT_SOCKET" \
             -output json >"$jwt_file"
@@ -90,17 +83,9 @@ jobs:
           jq -er '.[0].svids[0].svid' "$jwt_file" | \
             docker login "$PUSH_REGISTRY" --username zot --password-stdin
 
-          # The docker driver cannot publish attestations. Use an isolated
-          # BuildKit worker, but force its snapshotter to copy-based native so
-          # it does not attempt nested overlay mounts inside the runner Pod.
-          printf '%s\n' \
-            '[worker.oci]' \
-            '  snapshotter = "native"' \
-            >"$buildkit_config"
           docker buildx create \
             --name ci-builder \
             --driver docker-container \
-            --buildkitd-config "$buildkit_config" \
             --use
 
           publish() {