Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
fb02eeeb21
6
.github/workflows/master.yml
vendored
6
.github/workflows/master.yml
vendored
@ -26,9 +26,9 @@ jobs:
|
|||||||
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 registry.idwms.com/interfaceforward_api:latest
|
docker tag interfaceforward_api:latest registry.nanafa.com/interfaceforward_api:latest
|
||||||
# 推送镜像
|
# 推送镜像
|
||||||
docker push registry.idwms.com/interfaceforward_api:latest
|
docker push registry.nanafa.com/interfaceforward_api:latest
|
||||||
- name: Deploy to Server
|
- name: Deploy to Server
|
||||||
uses: appleboy/ssh-action@v0.1.5
|
uses: appleboy/ssh-action@v0.1.5
|
||||||
with:
|
with:
|
||||||
@ -38,5 +38,5 @@ jobs:
|
|||||||
script: |
|
script: |
|
||||||
cd /data
|
cd /data
|
||||||
docker stack deploy -c api.yml api # yml没变化不会更新
|
docker stack deploy -c api.yml api # yml没变化不会更新
|
||||||
docker service update --force --image registry.idwms.com/interfaceforward_api:latest itfx_interfaceforward_api # 一定要和service name一致
|
docker service update --force --image registry.nanafa.com/interfaceforward_api:latest api_itfx # 一定要和service name一致
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user