From 88fd363c1c4bc834a80398ec99f5bd5956c13868 Mon Sep 17 00:00:00 2001 From: xiaoliutral Date: Thu, 19 Jun 2025 02:33:30 +0800 Subject: [PATCH 1/6] Create master.yml --- .github/workflows/master.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/master.yml diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml new file mode 100644 index 0000000..2801b5d --- /dev/null +++ b/.github/workflows/master.yml @@ -0,0 +1,26 @@ +name: CI/CD Pipeline + +on: + push: + branches: + - master # 监视的分支 + +jobs: + deploy: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Deploy to Server + uses: appleboy/ssh-action@v0.1.5 + with: + host: ${{ secrets.SSH_HOST }} + username: ${{ secrets.SSH_USERNAME }} + password: ${{ secrets.SSH_PASSWORD }} + script: | + cd /data/portainer/itfx + git pull origin master + docker build -t interfaceforward_api:latest -f src/InterfaceForward.Api/Dockerfile . + docker service update --force --image interfaceforward_api:latest itfx_interfaceforward_api + From 948f9469e5d2905407e200e2b0cfcf3d6911e5ed Mon Sep 17 00:00:00 2001 From: xiaoliutral Date: Sat, 21 Jun 2025 11:55:47 +0800 Subject: [PATCH 2/6] Update master.yml --- .github/workflows/master.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 2801b5d..a304161 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -22,5 +22,6 @@ jobs: cd /data/portainer/itfx git pull origin master docker build -t interfaceforward_api:latest -f src/InterfaceForward.Api/Dockerfile . - docker service update --force --image interfaceforward_api:latest itfx_interfaceforward_api + docker service update --force --image interfaceforward_api:latest itfx_interfaceforward_api # 一定要和service name一致 + From 96801c871173c2390990efba599ab9e45d3d24fb Mon Sep 17 00:00:00 2001 From: xiaoliutral Date: Thu, 3 Jul 2025 10:08:16 +0800 Subject: [PATCH 3/6] Update master.yml --- .github/workflows/master.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index a304161..a01d3c8 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -22,6 +22,10 @@ jobs: cd /data/portainer/itfx git pull origin master docker build -t interfaceforward_api:latest -f src/InterfaceForward.Api/Dockerfile . + # 标记镜像 + docker tag interfaceforward_api:latest 43.139.210.35:5000/interfaceforward_api:latest + # 推送镜像 + docker push 43.139.210.35/interfaceforward_api:latest docker service update --force --image interfaceforward_api:latest itfx_interfaceforward_api # 一定要和service name一致 From ee32cac08de2b0510a8bcad351aa0448deefe3a4 Mon Sep 17 00:00:00 2001 From: xiaoliutral Date: Thu, 3 Jul 2025 10:09:45 +0800 Subject: [PATCH 4/6] Update master.yml --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index a01d3c8..b97ad24 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -25,7 +25,7 @@ jobs: # 标记镜像 docker tag interfaceforward_api:latest 43.139.210.35:5000/interfaceforward_api:latest # 推送镜像 - docker push 43.139.210.35/interfaceforward_api:latest + docker push 43.139.210.35:5000/interfaceforward_api:latest docker service update --force --image interfaceforward_api:latest itfx_interfaceforward_api # 一定要和service name一致 From 6757958162f955cd925a73eff09849fa92e6c2ec Mon Sep 17 00:00:00 2001 From: xiaoliutral Date: Thu, 3 Jul 2025 11:58:19 +0800 Subject: [PATCH 5/6] Update master.yml --- .github/workflows/master.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b97ad24..3d4b49e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -23,9 +23,9 @@ jobs: git pull origin master docker build -t interfaceforward_api:latest -f src/InterfaceForward.Api/Dockerfile . # 标记镜像 - docker tag interfaceforward_api:latest 43.139.210.35:5000/interfaceforward_api:latest + docker tag interfaceforward_api:latest registry.idwms.com/interfaceforward_api:latest # 推送镜像 - docker push 43.139.210.35:5000/interfaceforward_api:latest + docker push registry.idwms.com/interfaceforward_api:latest docker service update --force --image interfaceforward_api:latest itfx_interfaceforward_api # 一定要和service name一致 From c6fb682651f7268709476adffd74ea287a703bcf Mon Sep 17 00:00:00 2001 From: xiaoliutral Date: Thu, 3 Jul 2025 14:49:20 +0800 Subject: [PATCH 6/6] Update master.yml --- .github/workflows/master.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3d4b49e..3f525e1 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -19,13 +19,13 @@ jobs: username: ${{ secrets.SSH_USERNAME }} password: ${{ secrets.SSH_PASSWORD }} script: | - cd /data/portainer/itfx + cd /data/projects/itfx git pull origin master docker build -t interfaceforward_api:latest -f src/InterfaceForward.Api/Dockerfile . # 标记镜像 - docker tag interfaceforward_api:latest registry.idwms.com/interfaceforward_api:latest + docker tag interfaceforward_api:latest localhost:5000/interfaceforward_api:latest # 推送镜像 - docker push 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一致