From fd2371a1660737f51f7cceb01b190a1aa90e6cfa Mon Sep 17 00:00:00 2001
From: luochen570 <1160510664@qq.com>
Date: Sun, 31 May 2026 03:48:26 +0800
Subject: [PATCH] ci: use dind Docker API via gateway IP (port 2375)

---
 .gitea/workflows/deploy.yml | 38 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index da6e13a..c0a0f68 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -28,34 +28,26 @@ jobs:
       - name: Hugo Build
         run: hugo --minify
 
-      - name: Install Buildah
-        run: |
-          apt-get update -qq
-          apt-get install -y -qq buildah fuse-overlayfs uidmap
-          # Configure storage
-          mkdir -p /root/.local/share/containers
-          buildah version
-
-      - name: Build and Push with Buildah
+      - name: Build and Push Docker Image
         env:
           REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN }}
         run: |
-          # Login to Gitea Registry
-          echo "$REGISTRY_TOKEN" | \
-            buildah login ${{ env.REGISTRY }} -u luochen570 --password-stdin
+          # Find the Docker daemon (dind is on the gateway)
+          DOCKER_HOST_IP=$(ip route | grep default | awk '{print $3}')
+          export DOCKER_HOST="tcp://${DOCKER_HOST_IP}:2375"
+          echo "DOCKER_HOST=$DOCKER_HOST"
 
-          # Build container image (daemonless!)
-          buildah bud -t ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ github.sha }} .
+          # Login
+          echo "$REGISTRY_TOKEN" | docker login $REGISTRY -u luochen570 --password-stdin
 
-          # Push to registry
-          buildah push ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ github.sha }}
-          # Also tag as latest
-          buildah tag ${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ github.sha }} \
-            ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
-          buildah push ${{ env.REGISTRY }}/${{ env.IMAGE }}:latest
+          # Build
+          docker build -t $REGISTRY/$IMAGE:${{ github.sha }} .
+          docker tag $REGISTRY/$IMAGE:${{ github.sha }} $REGISTRY/$IMAGE:latest
+
+          # Push
+          docker push $REGISTRY/$IMAGE:${{ github.sha }}
+          docker push $REGISTRY/$IMAGE:latest
 
       - name: Deploy to k3s
         run: |
-          echo "kubectl deploy - skip for now, need runner kubectl access"
-          # kubectl set image deployment/hugo-blog -n hugo \
-          #   nginx=${{ env.REGISTRY }}/${{ env.IMAGE }}:${{ github.sha }}
+          echo "Deploy step - skipped until runner kubectl is configured"