From a81f28f304feea14bec80e6a9caa45380b3da972 Mon Sep 17 00:00:00 2001 From: shanshanzhong Date: Tue, 10 Feb 2026 09:44:15 -0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20SSH=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BD=BF=E7=94=A8?= =?UTF-8?q?GitHub=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=81=BF=E5=85=8Dshell?= =?UTF-8?q?=E8=BD=AC=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/docker.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/docker.yml b/.gitea/workflows/docker.yml index 68b670f..23096cb 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连接信息 (默认为dev开发环境，main分支会在动态环境变量步骤中覆盖为生产环境) - SSH_HOST: ${{ vars.DEV_SSH_HOST }} + # SSH连接信息 (根据分支自动选择) + SSH_HOST: ${{ github.ref_name == 'main' && vars.SSH_HOST || vars.DEV_SSH_HOST }} SSH_PORT: ${{ vars.SSH_PORT }} SSH_USER: ${{ vars.SSH_USER }} - SSH_PASSWORD: ${{ vars.DEV_SSH_PASSWORD }} + SSH_PASSWORD: ${{ github.ref_name == 'main' && vars.SSH_PASSWORD || vars.DEV_SSH_PASSWORD }} # TG通知 TG_BOT_TOKEN: 8114337882:AAHkEx03HSu7RxN4IHBJJEnsK9aPPzNLIk0 TG_CHAT_ID: "-4940243803" @@ -50,14 +50,12 @@ jobs: echo "DOCKER_TAG_SUFFIX=latest" >> $GITHUB_ENV echo "CONTAINER_NAME=ppanel-server" >> $GITHUB_ENV echo "DEPLOY_PATH=/root/bindbox" >> $GITHUB_ENV - echo "SSH_HOST=${{ vars.SSH_HOST }}" >> $GITHUB_ENV - echo "SSH_PASSWORD=${{ vars.SSH_PASSWORD }}" >> $GITHUB_ENV - echo "为 main 分支设置生产环境变量 (部署到生产服务器)" + 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