From 15c0db6742084b151a26a58f90bcb5cdea916984 Mon Sep 17 00:00:00 2001
From: sky121113 <sky121113@gmail.com>
Date: Tue, 21 Apr 2026 13:11:58 +0800
Subject: [PATCH] =?UTF-8?q?[REFACTOR]=20=E6=95=B4=E7=90=86=E4=B8=A6?=
 =?UTF-8?q?=E5=90=88=E4=BD=B5=20CI/CD=20=E6=BA=96=E5=82=99=E6=AD=A5?=
 =?UTF-8?q?=E9=A9=9F=20(Step=200)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/deploy-demo.yaml | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/.gitea/workflows/deploy-demo.yaml b/.gitea/workflows/deploy-demo.yaml
index 8b2ba38..f9bf204 100644
--- a/.gitea/workflows/deploy-demo.yaml
+++ b/.gitea/workflows/deploy-demo.yaml
@@ -12,34 +12,26 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v3
 
-      - name: Step 0.0 - Fix potential directory-instead-of-file host paths
+      - name: Step 0 - Prepare Environment & Sync Configs
         run: |
-          # 檢查宿主機上的固定路徑，如果是目錄則移除（通常是 Docker 誤建）
+          # 1. 確保 Runner 暫存區結構正確 (清理可能因先前失敗誤建的目錄)
+          if [ -d "docker/emqx/acl.conf" ]; then
+            echo "Removing docker/emqx/acl.conf directory in runner..."
+            rm -rf "docker/emqx/acl.conf"
+          fi
+          mkdir -p docker/emqx
+
+          # 2. 檢查並清理宿主機 (Host) 上被 Docker 誤建為目錄的檔案
           docker run --rm -v /workspace/mama/star-cloud:/target busybox sh -c "
             if [ -d /target/.env ]; then echo 'Removing .env directory on host'; rm -rf /target/.env; fi
             if [ -d /target/docker/emqx/acl.conf ]; then echo 'Removing acl.conf directory on host'; rm -rf /target/docker/emqx/acl.conf; fi
           "
 
-      - name: Step 0 - Prepare Environment
-        run: |
-          # 改為掛載父目錄，避免 Docker 自動建立目錄
+          # 3. 從宿主機載入持久化的 .env 檔案 (若無則複製 .env.example)
           docker run --rm -v /workspace/mama/star-cloud:/data:ro busybox cat /data/.env > .env || cp .env.example .env
 
-      - name: Step 0.1 - Fix potential directory-instead-of-file mounts
-        run: |
-          # 如果 acl.conf 是一個目錄，將其刪除，以免妨礙 docker compose 掛載檔案
-          if [ -d "docker/emqx/acl.conf" ]; then
-            echo "Found docker/emqx/acl.conf as a directory, removing it..."
-            rm -rf "docker/emqx/acl.conf"
-          fi
-          # 確保父目錄存在
-          mkdir -p docker/emqx
-
-      - name: Step 0.2 - Sync Docker Configs to Host
-        run: |
-          # 建立宿主機目錄架構 (如果不存在)
+          # 4. 將 Runner 最新 Checkout 的設定檔同步至宿主機持久區，確保後續 compose 掛載正確
           docker run --rm -v /workspace/mama/star-cloud:/target busybox mkdir -p /target/docker/emqx
-          # 將目前 Checkout 的 acl.conf 合併到宿主機持久區 (確保掛載源是檔案)
           docker run --rm -v $(pwd):/source -v /workspace/mama/star-cloud:/target busybox cp /source/docker/emqx/acl.conf /target/docker/emqx/acl.conf