From 50305dd29b2282a962b353e4533a28605ca9872b Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Wed, 22 Jul 2026 00:58:17 +0800
Subject: [PATCH] =?UTF-8?q?ci(stack):=20=E4=B8=BA=20B=20=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E9=87=8D=E5=86=99=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=B9=B6=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/build-and-deploy.yml                | 12 ++++++------
 .../default/.gitea/workflows/build-and-deploy.yml    | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitea/workflows/build-and-deploy.yml b/.gitea/workflows/build-and-deploy.yml
index 5937bad..b42f6d3 100644
--- a/.gitea/workflows/build-and-deploy.yml
+++ b/.gitea/workflows/build-and-deploy.yml
@@ -58,10 +58,6 @@ jobs:
           composer config -g repos.packagist composer https://nexus.hl7.top:1243/repository/composer-proxy/
           composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader
 
-      - name: 切换到 docker-serve 模式
-        shell: bash
-        run: php think admin:stack:mode use docker-serve -f
-
       - name: 打包发布文件
         shell: bash
         env:
@@ -106,7 +102,7 @@ jobs:
           username: ${{ secrets.UL_HOST15_USER }}
           password: ${{ secrets.UL_HOST15_PASSWORD }}
           port: ${{ secrets.UL_HOST15_PORT }}
-          source: "${{ env.PACKAGE_NAME }},docker-compose.yaml"
+          source: "${{ env.PACKAGE_NAME }},source/stack/docker-serve/docker-compose.yaml"
           target: "${{ env.REMOTE_APP_DIR }}/incoming"
           overwrite: true
 
@@ -130,7 +126,7 @@ jobs:
 
             RELEASE_DIR="${REMOTE_APP_DIR}/releases/${GITHUB_RUN_ID}"
             PACKAGE_PATH="${REMOTE_APP_DIR}/incoming/${PACKAGE_NAME}"
-            COMPOSE_PATH="${REMOTE_APP_DIR}/incoming/docker-compose.yaml"
+            COMPOSE_PATH="${REMOTE_APP_DIR}/incoming/source/stack/docker-serve/docker-compose.yaml"
 
             rm -rf "${RELEASE_DIR}"
             mkdir -p "${RELEASE_DIR}"
@@ -141,6 +137,10 @@ jobs:
               cp -f "${COMPOSE_PATH}" "${RELEASE_DIR}/docker-compose.yaml"
             fi
 
+            # B-route: docker-serve compose 原始路径基于 source/stack/docker-serve/，
+            # 使用 ../.. 引用项目根；远端 RELEASE_DIR 为扁平结构，需改回 .
+            sed -i 's|../..|.|g' "${RELEASE_DIR}/docker-compose.yaml"
+
             cd "${RELEASE_DIR}"
             export COMPOSE_PROJECT_NAME
 
diff --git a/source/stack/default/.gitea/workflows/build-and-deploy.yml b/source/stack/default/.gitea/workflows/build-and-deploy.yml
index 5937bad..b42f6d3 100644
--- a/source/stack/default/.gitea/workflows/build-and-deploy.yml
+++ b/source/stack/default/.gitea/workflows/build-and-deploy.yml
@@ -58,10 +58,6 @@ jobs:
           composer config -g repos.packagist composer https://nexus.hl7.top:1243/repository/composer-proxy/
           composer install --no-dev --no-interaction --prefer-dist --optimize-autoloader
 
-      - name: 切换到 docker-serve 模式
-        shell: bash
-        run: php think admin:stack:mode use docker-serve -f
-
       - name: 打包发布文件
         shell: bash
         env:
@@ -106,7 +102,7 @@ jobs:
           username: ${{ secrets.UL_HOST15_USER }}
           password: ${{ secrets.UL_HOST15_PASSWORD }}
           port: ${{ secrets.UL_HOST15_PORT }}
-          source: "${{ env.PACKAGE_NAME }},docker-compose.yaml"
+          source: "${{ env.PACKAGE_NAME }},source/stack/docker-serve/docker-compose.yaml"
           target: "${{ env.REMOTE_APP_DIR }}/incoming"
           overwrite: true
 
@@ -130,7 +126,7 @@ jobs:
 
             RELEASE_DIR="${REMOTE_APP_DIR}/releases/${GITHUB_RUN_ID}"
             PACKAGE_PATH="${REMOTE_APP_DIR}/incoming/${PACKAGE_NAME}"
-            COMPOSE_PATH="${REMOTE_APP_DIR}/incoming/docker-compose.yaml"
+            COMPOSE_PATH="${REMOTE_APP_DIR}/incoming/source/stack/docker-serve/docker-compose.yaml"
 
             rm -rf "${RELEASE_DIR}"
             mkdir -p "${RELEASE_DIR}"
@@ -141,6 +137,10 @@ jobs:
               cp -f "${COMPOSE_PATH}" "${RELEASE_DIR}/docker-compose.yaml"
             fi
 
+            # B-route: docker-serve compose 原始路径基于 source/stack/docker-serve/，
+            # 使用 ../.. 引用项目根；远端 RELEASE_DIR 为扁平结构，需改回 .
+            sed -i 's|../..|.|g' "${RELEASE_DIR}/docker-compose.yaml"
+
             cd "${RELEASE_DIR}"
             export COMPOSE_PROJECT_NAME