From a1525037aea3938edc6c5d01e12ba2a3274db347 Mon Sep 17 00:00:00 2001
From: Graham McIntire <graham@mcintire.me>
Date: Sun, 26 Jul 2026 18:59:09 -0500
Subject: [PATCH] fix: install docker CLI and use kaniko executor image
 directly

---
 .forgejo/workflows/build.yaml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml
index 0e74fe5..1cc8012 100644
--- a/.forgejo/workflows/build.yaml
+++ b/.forgejo/workflows/build.yaml
@@ -22,21 +22,23 @@ jobs:
           TAG="main-${TIMESTAMP}-${SHORT_SHA}"
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
 
+      - name: Install Docker CLI
+        run: |
+          apt-get update && apt-get install -y docker.io
+
       - name: Build and Push with Kaniko
         run: |
-          KANIKO_VERSION="v1.23.2"
-          curl -fsSL "https://github.com/GoogleContainerTools/kaniko/releases/download/${KANIKO_VERSION}/executor-linux-amd64" \
-            -o /usr/local/bin/executor
-          chmod +x /usr/local/bin/executor
-
           mkdir -p /kaniko/.docker
           cat > /kaniko/.docker/config.json <<EOF
           {"auths":{"git.mcintire.me":{"username":"graham","password":"${{ secrets.FORGEJO_TOKEN }}"}}}
           EOF
 
-          /usr/local/bin/executor \
-            --context=dir://. \
-            --dockerfile=Dockerfile \
+          docker run --rm \
+            -v "$(pwd)":/workspace \
+            -v /kaniko/.docker:/kaniko/.docker \
+            gcr.io/kaniko-project/executor:latest \
+            --context=/workspace \
+            --dockerfile=/workspace/Dockerfile \
             --destination="git.mcintire.me/graham/aprs.me:${{ steps.tag.outputs.tag }}" \
             --destination="git.mcintire.me/graham/aprs.me:latest" \
             --cache=true