Merge remote-tracking branch 'origin/master'

This commit is contained in:
xiaolipro 2026-02-04 14:34:47 +08:00
commit b86a01f1bf

View File

@ -12,20 +12,31 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Deploy to Server - name: Build to Server
uses: appleboy/ssh-action@v0.1.5 uses: appleboy/ssh-action@v0.1.5
with: with:
host: ${{ secrets.SSH_HOST }} host: ${{ secrets.SSH_BUILD_HOST }}
username: ${{ secrets.SSH_USERNAME }} username: ${{ secrets.SSH_USERNAME }}
password: ${{ secrets.SSH_PASSWORD }} password: ${{ secrets.SSH_PASSWORD }}
script: | 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 git pull origin master
docker build -t interfaceforward_api:latest -f src/InterfaceForward.Api/Dockerfile . 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 push registry.idwms.com/interfaceforward_api:latest
docker service update --force --image interfaceforward_api:latest itfx_interfaceforward_api # 一定要和service name一致 - 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: |
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一致