diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index b602875..8beda91 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -28,7 +28,7 @@ jobs: - name: 设置镜像标签 id: tag run: | - echo "tag=latest" >> $GITHUB_OUTPUT + echo "tag=${{ github.sha }}" >> $GITHUB_OUTPUT - name: 登录 Docker Registry run: | @@ -37,19 +37,15 @@ jobs: - name: 构建 API 镜像 run: | docker build -f Dockerfile.api -t ${{ env.API_IMAGE }}:${{ steps.tag.outputs.tag }} . - docker tag ${{ env.API_IMAGE }}:${{ steps.tag.outputs.tag }} ${{ env.API_IMAGE }}:${{ github.sha }} - name: 构建 Worker 镜像 run: | docker build -f Dockerfile.worker -t ${{ env.WORKER_IMAGE }}:${{ steps.tag.outputs.tag }} . - docker tag ${{ env.WORKER_IMAGE }}:${{ steps.tag.outputs.tag }} ${{ env.WORKER_IMAGE }}:${{ github.sha }} - name: 推送镜像到 Registry run: | docker push ${{ env.API_IMAGE }}:${{ steps.tag.outputs.tag }} - docker push ${{ env.API_IMAGE }}:${{ github.sha }} docker push ${{ env.WORKER_IMAGE }}:${{ steps.tag.outputs.tag }} - docker push ${{ env.WORKER_IMAGE }}:${{ github.sha }} - name: 部署到测试环境(仅八月迭代分支) if: github.ref == 'refs/heads/Iteration/8-11' @@ -59,6 +55,7 @@ jobs: umask 077 { + printf 'IMAGE_TAG=%s\n' '${{ github.sha }}' printf 'JUNHONG_APPROVAL_LEGACY_REFUND_MANUAL_ENABLED=true\n' printf 'JUNHONG_APPROVAL_LEGACY_OFFLINE_RECHARGE_PAY_ENABLED=true\n' printf 'JUNHONG_WORKER_ROLE=all\n' diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 6015bfe..e3a59fc 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -29,7 +29,7 @@ services: api: - image: registry.boss160.cn/junhong/cmp-fiber-api:latest + image: registry.boss160.cn/junhong/cmp-fiber-api:${IMAGE_TAG:-latest} container_name: junhong-cmp-api restart: unless-stopped ports: @@ -102,7 +102,7 @@ services: max-file: "3" worker: - image: registry.boss160.cn/junhong/cmp-fiber-worker:latest + image: registry.boss160.cn/junhong/cmp-fiber-worker:${IMAGE_TAG:-latest} container_name: junhong-cmp-worker restart: unless-stopped environment: