From 3a8eb105a6d7ffd76b395b070fdd2a676750b9b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=8C=BF?= Date: Tue, 7 Oct 2025 04:01:52 +0800 Subject: [PATCH] vasss --- .gitea/workflows/build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 71cc1b9..009c229 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - name: 替换镜像标签为 github.sha run: | - sed -i "s|{{IMAGE_TAG}}|${{ github.sha }}|g" app-product.yml + sed -i "s|{{IMAGE_TAG}}|${{ github.sha }}|g" ${{ vars.DOCKER_SWARM_YML }} - name: 上传 app-product.yml 到前端集群管理机 uses: appleboy/scp-action@v1 @@ -44,8 +44,8 @@ jobs: host: ${{ vars.SSH_MANAGE }} username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} - port: ${{ secrets.PORT }} - source: "app-product.yml" + port: ${{ vars.PORT }} + source: ${{ vars.DOCKER_SWARM_YML }} target: ${{ vars.SSH_MANAGE_PATH }} - name: 登录前端集群,拉镜像 @@ -57,9 +57,9 @@ jobs: sync: true username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} - port: ${{ secrets.PORT }} + port: ${{ vars.PORT }} script: | - # 简化版:删除该仓库的所有镜像(无需排除) + # 删除该仓库的所有镜像 docker images --format "{{.ID}}" ${{ vars.DOCKER_REGISTRY }}/${{ vars.DOCKER_IMAGE_NAME }} | xargs -r docker rmi -f # 拉取刚打包的最新镜像 docker pull ${{ vars.DOCKER_REGISTRY }}/${{ vars.DOCKER_IMAGE_NAME }}:${{ github.sha }} @@ -71,7 +71,7 @@ jobs: sync: true username: ${{ secrets.USERNAME }} password: ${{ secrets.PASSWORD }} - port: ${{ secrets.PORT }} + port: ${{ vars.PORT }} script: | # 切换到管理员,要不然没权限在服务器执行 docker 命令,部署到 Swarm 集群 - sudo docker stack deploy -c ${{ vars.SSH_MANAGE_PATH }}/app-product.yml ${{ vars.DOCKER_IMAGE_NAME }} + sudo docker stack deploy -c ${{ vars.SSH_MANAGE_PATH }}/${{ vars.DOCKER_SWARM_YML }} ${{ vars.DOCKER_IMAGE_NAME }}