From 7aada180de189e78a19ee917ad7970f6b170b715 Mon Sep 17 00:00:00 2001
From: Erich Blume <blume.erich@gmail.com>
Date: Fri, 30 Jan 2026 10:13:30 -0800
Subject: [PATCH] Use skopeo for registry push (Docker 27 manifest compat)

Docker 27's manifest format has compatibility issues with zot registry.
Skopeo handles manifest conversion correctly.

Still simpler than the old Tailscale sidecar approach - just save to
tarball and use skopeo copy.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .forgejo/actions/build-push-image/action.yaml | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/.forgejo/actions/build-push-image/action.yaml b/.forgejo/actions/build-push-image/action.yaml
index d0d4678..93b2c11 100644
--- a/.forgejo/actions/build-push-image/action.yaml
+++ b/.forgejo/actions/build-push-image/action.yaml
@@ -1,5 +1,8 @@
 name: 'Build and Push Image'
-description: 'Build a container image with Docker and push to registry.ops.eblu.me'
+description: 'Build a container image with Docker and push to registry.ops.eblu.me using skopeo'
+
+# Note: Uses skopeo for push because Docker 27's manifest format has compatibility
+# issues with zot registry. Skopeo handles manifest conversion correctly.
 
 inputs:
   context:
@@ -26,19 +29,32 @@ runs:
     - name: Build image
       shell: bash
       run: |
-        echo "Building ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }}"
+        echo "Building ${{ inputs.image_name }}:${{ inputs.version }}"
         docker build \
-          --tag ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }} \
-          --tag ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }} \
+          --tag ${{ inputs.image_name }}:${{ inputs.version }} \
           --file ${{ inputs.context }}/${{ inputs.dockerfile }} \
           ${{ inputs.context }}
 
     - name: Push to registry
       shell: bash
       run: |
+        echo "Saving image to tarball..."
+        docker save ${{ inputs.image_name }}:${{ inputs.version }} -o /tmp/image.tar
+
+        echo "Installing skopeo..."
+        apk add --no-cache skopeo >/dev/null 2>&1 || apt-get update && apt-get install -y skopeo >/dev/null 2>&1 || true
+
         echo "Pushing ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }}"
-        docker push ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }}
-        docker push ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }}
+        skopeo copy \
+          docker-archive:/tmp/image.tar \
+          docker://${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }}
+
+        echo "Pushing ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }}"
+        skopeo copy \
+          docker-archive:/tmp/image.tar \
+          docker://${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }}
+
+        rm -f /tmp/image.tar
 
     - name: Summary
       shell: bash