From fb224b3bcedf3a2121e0290cc8c8adccbfa4055f Mon Sep 17 00:00:00 2001 From: gewuyou Date: Sun, 11 May 2025 12:05:33 +0800 Subject: [PATCH] =?UTF-8?q?ci(deploy):=20=E4=BC=98=E5=8C=96=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E6=B5=81=E7=A8=8B=E5=B9=B6=E6=8F=90=E5=8D=87=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加下载并使用 drone-scp 二进制文件的步骤,以提高 SCP传输的安全性 - 修改目标路径,将 docker-compose 文件直接复制到目标目录 - 为 SCP传输步骤设置 DRONE_SCP_BINARY 环境变量,指定自定义 SCP 二进制文件 --- .gitea/workflows/deploy.master.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy.master.yml b/.gitea/workflows/deploy.master.yml index 7d6ac54..fc21365 100644 --- a/.gitea/workflows/deploy.master.yml +++ b/.gitea/workflows/deploy.master.yml @@ -76,24 +76,33 @@ jobs: uses: ${{env.JCNC_GITEA_URL}}/gradle/actions/setup-gradle@v4 with: gradle-version: wrapper # 使用项目自带的gradle-wrapper + - name: 🔽 Download drone-scp + run: | + curl -L "https://github.moeyy.xyz/https://github.com/appleboy/drone-scp/releases/download/v1.8.0/drone-scp-1.8.0-linux-amd64" \ + -o drone-scp + chmod +x drone-scp - name: 📦 Copy Compose File to Internal Server uses: ${{env.JCNC_GITEA_URL}}/appleboy/scp-action@v1 + env: + DRONE_SCP_BINARY: ./drone-scp with: host: ${{ env.INTERNAL_SERVER_HOST }} port: $INTERNAL_SERVER_PROT username: root password: ${{ secrets.INTERNAL_SERVER_PASSWORD }} source: $MAIN_COMPOSE_FILE - target: "/home/luke/deploy/llmx/docker-compose.master.yml" + target: "/home/luke/deploy/llmx/" - name: 📦 Copy Compose File to Singapore Server uses: ${{env.JCNC_GITEA_URL}}/appleboy/scp-action@v1 + env: + DRONE_SCP_BINARY: ./drone-scp with: host: $SINGAPORE_SERVER_HOST port: $SSH_PROT username: root password: ${{ secrets.SINGAPORE_SERVER_PASSWORD }} source: $AGENT_COMPOSE_FILE - target: "/home/deploy/llmx/docker-compose.master.yml" + target: "/home/deploy/llmx/" # ========== 5. 构建阶段 ========== - name: 🏗️ Build with Jib run: | -- 2.47.2