From 0958c3db1a482e3d88c6b0b093dec2b41d9a5d75 Mon Sep 17 00:00:00 2001
From: "CI Bot (saas-backend-agent)" <ci@xiaoxiajianji.com>
Date: Sun, 27 Sep 2026 00:58:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(version):=20=E8=AE=A9=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=97=B6=E6=B3=A8=E5=85=A5=E7=9A=84=20APP=5F?=
 =?UTF-8?q?VERSION=20(commit=20SHA)=20=E6=AD=A3=E7=A1=AE=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- infra/docker/compose.yml: 移除 environment 里 APP_VERSION=${APP_VERSION:-unknown} 硬编码默认值，
  避免 compose 启动时用 "unknown" 覆盖 Dockerfile ARG/ENV 注入的 commit SHA。
  未显式传 -e APP_VERSION 时，容器使用镜像 ENV（即构建时 --build-arg APP_VERSION=<sha> 的值）；
  需要 override 时仍可通过 docker compose -e 或宿主机环境变量传入。
- .gitea/workflows/ci-pipeline.yml: 去掉 EXTRA_BUILD_ARGS 中 APP_VERSION 值的多余转义引号，
  避免 build-arg 把字面双引号注入版本号（之前 version 显示为 "\"abc123\"" 而非 "abc123"）。
---
 .gitea/workflows/ci-pipeline.yml | 6 +++---
 infra/docker/compose.yml         | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/ci-pipeline.yml b/.gitea/workflows/ci-pipeline.yml
index dca65be07..e80e556d1 100755
--- a/.gitea/workflows/ci-pipeline.yml
+++ b/.gitea/workflows/ci-pipeline.yml
@@ -813,7 +813,7 @@ jobs:
         IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:pr-${GITHUB_SHA}"
         CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:develop"
 
-        EXTRA_BUILD_ARGS="APP_VERSION=\"${GITHUB_SHA}\""
+        EXTRA_BUILD_ARGS="APP_VERSION=${GITHUB_SHA}"
 
         # Worker 与 API/Web 统一走持久 builder（ci-builder-persist），共享宿主机层缓存
         NO_CACHE_FLAG=""
@@ -1014,7 +1014,7 @@ jobs:
           PUSHED_TAGS_SUMMARY="${BRANCH_TAG}"
         fi
 
-        EXTRA_BUILD_ARGS="APP_VERSION=\"${GITHUB_SHA}\""
+        EXTRA_BUILD_ARGS="APP_VERSION=${GITHUB_SHA}"
 
         NO_CACHE_FLAG=""
         for i in 1 2 3; do
@@ -1552,7 +1552,7 @@ jobs:
         IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:${TAG_NAME}"
         CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:main"
 
-        EXTRA_BUILD_ARGS="APP_VERSION=\"${TAG_NAME}\""
+        EXTRA_BUILD_ARGS="APP_VERSION=${TAG_NAME}"
 
         # Docker build 带重试：失败自动重试2次，第2次重试加--no-cache
         NO_CACHE_FLAG=""
diff --git a/infra/docker/compose.yml b/infra/docker/compose.yml
index 81b71a2ec..13e5abee8 100755
--- a/infra/docker/compose.yml
+++ b/infra/docker/compose.yml
@@ -56,7 +56,6 @@ services:
     
     environment:
       APP_ENV: ${APP_ENV:-staging}
-      APP_VERSION: ${APP_VERSION:-unknown}
       GENERATED_FILES_DIR: /app/generated
       GENERATED_FILES_URL_PREFIX: /generated-files
       PUBLIC_API_BASE_URL: ${PUBLIC_API_BASE_URL:-https://api.xiaoxiajianji.com}
@@ -113,7 +112,6 @@ services:
     
     environment:
       APP_ENV: ${APP_ENV:-staging}
-      APP_VERSION: ${APP_VERSION:-unknown}
       WORKER_CONCURRENCY: ${WORKER_CONCURRENCY:-4}
       WORKER_MAX_TASKS_PER_CHILD: ${WORKER_MAX_TASKS_PER_CHILD:-100}
       # #1714 队列隔离：generation 队列独占 worker（默认并发 2），其余并发给转码
-- 
2.54.0