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),其余并发给转码