From 505932d9d1a6749a6558452c9e9f4e3bda4d4ec6 Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Mon, 9 Feb 2026 20:58:36 -0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BC=98=E5=8C=96:=20?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8dev=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=EF=BC=8Cmain=E5=88=86=E6=94=AF=E6=98=BE=E5=BC=8F=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E4=B8=BA=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/docker.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index da88306..68b670f 100644 --- a/.gitea/workflows/docker.yml +++ b/.gitea/workflows/docker.yml @@ -14,11 +14,11 @@ on: env: # Docker镜像仓库 REPO: ${{ vars.REPO || 'registry.kxsw.us/vpn-server' }} - # SSH连接信息 - SSH_HOST: ${{ vars.SSH_HOST }} + # SSH连接信息 (默认为dev开发环境，main分支会在动态环境变量步骤中覆盖为生产环境) + SSH_HOST: ${{ vars.DEV_SSH_HOST }} SSH_PORT: ${{ vars.SSH_PORT }} SSH_USER: ${{ vars.SSH_USER }} - SSH_PASSWORD: ${{ vars.SSH_PASSWORD }} + SSH_PASSWORD: ${{ vars.DEV_SSH_PASSWORD }} # TG通知 TG_BOT_TOKEN: 8114337882:AAHkEx03HSu7RxN4IHBJJEnsK9aPPzNLIk0 TG_CHAT_ID: "-4940243803" @@ -50,12 +50,14 @@ jobs: echo "DOCKER_TAG_SUFFIX=latest" >> $GITHUB_ENV echo "CONTAINER_NAME=ppanel-server" >> $GITHUB_ENV echo "DEPLOY_PATH=/root/bindbox" >> $GITHUB_ENV - echo "为 main 分支设置生产环境变量" + echo "SSH_HOST=${{ vars.SSH_HOST }}" >> $GITHUB_ENV + echo "SSH_PASSWORD=${{ vars.SSH_PASSWORD }}" >> $GITHUB_ENV + echo "为 main 分支设置生产环境变量 (部署到生产服务器)" elif [ "${{ github.ref_name }}" = "dev" ]; then echo "DOCKER_TAG_SUFFIX=dev" >> $GITHUB_ENV echo "CONTAINER_NAME=ppanel-server-dev" >> $GITHUB_ENV echo "DEPLOY_PATH=/root/bindbox" >> $GITHUB_ENV - echo "为 dev 分支设置开发环境变量" + echo "为 dev 分支设置开发环境变量 (部署到开发服务器)" else echo "DOCKER_TAG_SUFFIX=${{ github.ref_name }}" >> $GITHUB_ENV echo "CONTAINER_NAME=ppanel-server-${{ github.ref_name }}" >> $GITHUB_ENV