From 0306ac05a484695527cdc6bf38526017bdb95cd5 Mon Sep 17 00:00:00 2001 From: xiaoliutral Date: Tue, 3 Feb 2026 17:02:18 +0800 Subject: [PATCH 1/3] Update master.yml --- .github/workflows/master.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3f525e1..a6c4bc4 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -12,10 +12,10 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - - name: Deploy to Server + - name: Build to Server uses: appleboy/ssh-action@v0.1.5 with: - host: ${{ secrets.SSH_HOST }} + host: ${{ secrets.SSH_BUILD_HOST }} username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | @@ -23,9 +23,15 @@ jobs: git pull origin master docker build -t interfaceforward_api:latest -f src/InterfaceForward.Api/Dockerfile . # 标记镜像 - docker tag interfaceforward_api:latest localhost:5000/interfaceforward_api:latest + docker tag interfaceforward_api:latest registry.idwms.com/interfaceforward_api:latest # 推送镜像 - docker push localhost:5000/interfaceforward_api:latest - docker service update --force --image interfaceforward_api:latest itfx_interfaceforward_api # 一定要和service name一致 - + docker push registry.idwms.com/interfaceforward_api:latest + - name: Deploy to Server + uses: appleboy/ssh-action@v0.1.5 + with: + host: ${{ secrets.SSH_MANAGER_HOST }} + username: ${{ secrets.SSH_USERNAME }} + password: ${{ secrets.SSH_PASSWORD }} + script: | + docker service update --force --image registry.idwms.com/interfaceforward_api:latest itfx_interfaceforward_api # 一定要和service name一致 From 0a668896339573dcc225088e9440127b81d3055d Mon Sep 17 00:00:00 2001 From: xiaoliutral Date: Tue, 3 Feb 2026 17:54:46 +0800 Subject: [PATCH 2/3] Modify GitHub Actions workflow for project setup Update workflow to create projects directory and clone repository. --- .github/workflows/master.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index a6c4bc4..8796cea 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -19,7 +19,10 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | - cd /data/projects/itfx + mkdir -p /data/projects + cd /data/projects + git clone git@github.com:xiaoliutral/itfx.git + cd itfx git pull origin master docker build -t interfaceforward_api:latest -f src/InterfaceForward.Api/Dockerfile . # 标记镜像 From 8c95e489da9d92e915cc1ae796c8f27853e9a2e7 Mon Sep 17 00:00:00 2001 From: xiaoliutral Date: Wed, 4 Feb 2026 14:34:33 +0800 Subject: [PATCH 3/3] Modify deployment script in master.yml Update deployment script in master.yml to include a comment about yml changes. --- .github/workflows/master.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 8796cea..5d91130 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -36,5 +36,7 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | + cd /data + docker stack deploy -c api.yml api # yml没变化不会更新 docker service update --force --image registry.idwms.com/interfaceforward_api:latest itfx_interfaceforward_api # 一定要和service name一致