From 90b8b429e13c2b2454409bee98219126a5d6e652 Mon Sep 17 00:00:00 2001
From: NexVeridian <nexveridian@gmail.com>
Date: Thu, 21 Aug 2025 13:39:24 -0700
Subject: [PATCH] docker daemon

---
 .forgejo/workflows/docker.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml
index 278a963..b3302e4 100644
--- a/.forgejo/workflows/docker.yml
+++ b/.forgejo/workflows/docker.yml
@@ -48,12 +48,14 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - name: Install Docker
+      # Install skopeo from Nix (for daemonless image operations)
+      - name: Install skopeo
         run: |
           mkdir -p ~/.local/bin
-          nix build -I nixpkgs=channel:nixos-unstable nixpkgs#docker -o ~/.local/docker
-          ln -sf ~/.local/docker/bin/docker ~/.local/bin/docker
+          nix build -I nixpkgs=channel:nixos-unstable nixpkgs#skopeo -o ~/.local/skopeo
+          ln -sf ~/.local/skopeo/bin/skopeo ~/.local/bin/skopeo
           echo "$HOME/.local/bin" >> $GITHUB_PATH
+          skopeo --version
 
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
@@ -83,11 +85,13 @@ jobs:
           echo "STRIP_REPO_USERNAME=${STRIP_REPO_USERNAME}" >> ${GITHUB_ENV}
 
       # https://github.com/docker/build-push-action/issues/538
-      - name: Push and tag Docker image
+      - name: Push Docker image with skopeo
         run: |
-          docker load < result
-          docker tag ${{ env.STRIP_REPO_USERNAME }}:latest ${{ env.REGISTRY }}/${{ env.REPO }}:latest
-          docker push ${{ env.REGISTRY }}/${{ env.REPO }}:latest
+          # Copy the image directly from the Nix result to the registry
+          skopeo copy \
+            --dest-creds ${{ github.actor }}:${{ secrets.GITHUB_TOKEN }} \
+            docker-archive:result \
+            docker://${{ env.REGISTRY }}/${{ env.REPO }}:latest
 
       - name: Push to attic
         if: always()