From 2815faf8272b06216f8f619bbd571f5ef56b160a Mon Sep 17 00:00:00 2001
From: alpha-nerd-nomyo <alpha-nerd@nomyo.ai>
Date: Sun, 5 Apr 2026 09:50:44 +0200
Subject: [PATCH] fix: mergeblock missing container block

---
 .forgejo/workflows/docker-publish-semantic.yml | 17 ++++++++++++++++-
 .forgejo/workflows/docker-publish.yml          | 17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/docker-publish-semantic.yml b/.forgejo/workflows/docker-publish-semantic.yml
index 10fda4d..cf867bb 100644
--- a/.forgejo/workflows/docker-publish-semantic.yml
+++ b/.forgejo/workflows/docker-publish-semantic.yml
@@ -90,6 +90,9 @@ jobs:
   merge:
     runs-on: docker-amd64
     needs: build
+    container:
+      image: node:lts-bookworm
+      options: --privileged
     permissions:
       contents: read
       packages: write
@@ -97,7 +100,19 @@ jobs:
       - name: Install Docker
         run: |
           apt-get update -qq
-          apt-get install -y -qq docker.io
+          apt-get install -y -qq docker.io jq
+
+      - name: Start Docker daemon
+        run: |
+          dockerd --host=unix:///var/run/docker.sock --iptables=false --dns=8.8.8.8 --dns=8.8.4.4 > /tmp/dockerd.log 2>&1 &
+          for i in $(seq 1 30); do
+            sleep 2
+            docker info > /dev/null 2>&1 && echo "Docker daemon ready" && exit 0
+            echo "Waiting for Docker daemon... ($i/30)"
+          done
+          echo "=== dockerd failed to start, logs: ==="
+          cat /tmp/dockerd.log
+          exit 1
 
       - name: Set up Docker Buildx
         uses: https://github.com/docker/setup-buildx-action@v3
diff --git a/.forgejo/workflows/docker-publish.yml b/.forgejo/workflows/docker-publish.yml
index 4294966..3faf10b 100644
--- a/.forgejo/workflows/docker-publish.yml
+++ b/.forgejo/workflows/docker-publish.yml
@@ -81,6 +81,9 @@ jobs:
   merge:
     runs-on: docker-amd64
     needs: build
+    container:
+      image: node:lts-bookworm
+      options: --privileged
     permissions:
       contents: read
       packages: write
@@ -88,7 +91,19 @@ jobs:
       - name: Install Docker
         run: |
           apt-get update -qq
-          apt-get install -y -qq docker.io
+          apt-get install -y -qq docker.io jq
+
+      - name: Start Docker daemon
+        run: |
+          dockerd --host=unix:///var/run/docker.sock --iptables=false --dns=8.8.8.8 --dns=8.8.4.4 > /tmp/dockerd.log 2>&1 &
+          for i in $(seq 1 30); do
+            sleep 2
+            docker info > /dev/null 2>&1 && echo "Docker daemon ready" && exit 0
+            echo "Waiting for Docker daemon... ($i/30)"
+          done
+          echo "=== dockerd failed to start, logs: ==="
+          cat /tmp/dockerd.log
+          exit 1
 
       - name: Set up Docker Buildx
         uses: https://github.com/docker/setup-buildx-action@v3