From b25a6f042f9dca0d233038136ae3415ba9174daa Mon Sep 17 00:00:00 2001
From: forgejo_admin <admin@coulomb.social>
Date: Fri, 3 Jul 2026 22:41:51 +0000
Subject: [PATCH] Fix image-build: single-step docker install+push

---
 .forgejo/workflows/image-build.yaml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/.forgejo/workflows/image-build.yaml b/.forgejo/workflows/image-build.yaml
index aaea2cc..4a0a9b6 100644
--- a/.forgejo/workflows/image-build.yaml
+++ b/.forgejo/workflows/image-build.yaml
@@ -19,22 +19,17 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install docker CLI (static binary)
+      - name: Build and push image
+        env:
+          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
+          REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
         run: |
           set -eu
           mkdir -p "${HOME}/bin"
           wget -qO- https://download.docker.com/linux/static/stable/x86_64/docker-27.3.1.tgz             | tar xz --strip-components=1 -C "${HOME}/bin" docker/docker
-          echo "${HOME}/bin" >> "${GITHUB_PATH}"
-          "${HOME}/bin/docker" version
-
-      - name: Login to Forgejo registry
-        run: |
-          set -eu
-          echo "${{ secrets.REGISTRY_TOKEN }}" | docker login "${REGISTRY}"             -u "${{ secrets.REGISTRY_USER }}" --password-stdin
-
-      - name: Build and push
-        run: |
-          set -eu
+          export PATH="${HOME}/bin:${PATH}"
+          docker version
+          echo "${REGISTRY_TOKEN}" | docker login "${REGISTRY}" -u "${REGISTRY_USER}" --password-stdin
           TAG="${GITHUB_SHA:-manual}"
           SHORT="${TAG:0:7}"
           IMAGE="${REGISTRY}/${IMAGE_NAME}"