csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正测试环境按提交镜像部署
Some checks failed
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Failing after 6m5s
Details

Browse Source 
Gitea workflow 只以 github.sha 构建/推送镜像标签，部署时写入
IMAGE_TAG 到 .env；compose 的 api/worker image 引用 IMAGE_TAG，
默认 latest 仅作本地兜底，测试部署必须解析为提交 SHA。
This commit is contained in:
break
2026-09-09 18:18:13 +08:00
parent 98c145fe70
commit e09c4632fb
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitea/workflows/deploy.yaml
View File

@@ -28,7 +28,7 @@ jobs:
- name: 设置镜像标签 - name: 设置镜像标签
id: tag id: tag
run: | run: |
echo "tag=latest" >> $GITHUB_OUTPUT echo "tag=${{ github.sha }}" >> $GITHUB_OUTPUT
- name: 登录 Docker Registry - name: 登录 Docker Registry
run: | run: |
@@ -37,19 +37,15 @@ jobs:
- name: 构建 API 镜像 - name: 构建 API 镜像
run: | run: |
docker build -f Dockerfile.api -t ${{ env.API_IMAGE }}:${{ steps.tag.outputs.tag }} . 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 镜像 - name: 构建 Worker 镜像
run: | run: |
docker build -f Dockerfile.worker -t ${{ env.WORKER_IMAGE }}:${{ steps.tag.outputs.tag }} . 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 - name: 推送镜像到 Registry
run: | run: |
docker push ${{ env.API_IMAGE }}:${{ steps.tag.outputs.tag }} 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 }}:${{ steps.tag.outputs.tag }}
docker push ${{ env.WORKER_IMAGE }}:${{ github.sha }}
- name: 部署到测试环境（仅八月迭代分支） - name: 部署到测试环境（仅八月迭代分支）
if: github.ref == 'refs/heads/Iteration/8-11' if: github.ref == 'refs/heads/Iteration/8-11'
@@ -59,6 +55,7 @@ jobs:
umask 077 umask 077
{ {
printf 'IMAGE_TAG=%s\n' '${{ github.sha }}'
printf 'JUNHONG_APPROVAL_LEGACY_REFUND_MANUAL_ENABLED=true\n' printf 'JUNHONG_APPROVAL_LEGACY_REFUND_MANUAL_ENABLED=true\n'
printf 'JUNHONG_APPROVAL_LEGACY_OFFLINE_RECHARGE_PAY_ENABLED=true\n' printf 'JUNHONG_APPROVAL_LEGACY_OFFLINE_RECHARGE_PAY_ENABLED=true\n'
printf 'JUNHONG_WORKER_ROLE=all\n' printf 'JUNHONG_WORKER_ROLE=all\n'

4
docker-compose.prod.yml
View File

@@ -29,7 +29,7 @@
services: services:
api: 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 container_name: junhong-cmp-api
restart: unless-stopped restart: unless-stopped
ports: ports:
@@ -102,7 +102,7 @@ services:
max-file: "3" max-file: "3"
worker: 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 container_name: junhong-cmp-worker
restart: unless-stopped restart: unless-stopped
environment: environment: