fix(deploy): 修复组件版本解析和安装升级验收流程

2026-10-18 00:18:00 +08:00
parent 895d92317e
commit b99eb849b4
30 changed files with 1579 additions and 270 deletions
@@ -12,37 +12,23 @@ application_selected() {
    [ -z "${UPDATE_SERVICES:-}" ] || [[ " ${UPDATE_SERVICES} " == *" $1 "* ]]
 }

-plan_application_versions() {
-    local file="$1" service key option image value suffix base old_default
-    APPLICATION_VERSION_WRITES=()
-    while read -r service key option image; do
-        value="${!option:-}"
-        if [ -n "$value" ] && ! application_selected "$service"; then
-            echo "❌ $option 要求在 UPDATE_SERVICES 中指定 $service；尚未修改环境或容器" >&2
-            return 1
-        fi
-        application_selected "$service" || continue
-        if [ -z "$value" ] && [ -n "${UPDATE_RELEASE_VERSION:-}" ]; then value="$UPDATE_RELEASE_VERSION"; fi
-        if [ -z "$value" ]; then value="$(read_env_value "$file" "$key")"; fi
-        if [ -z "$value" ]; then value="$(read_env_value "$file" VERSION)"; fi
-        suffix=''
-        if [ "$service" = easyai-web ]; then suffix='(-no-ssr|-hmg-ai|-easyai|-chinacuc)?'; fi
-        if ! [[ "$value" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]{8}(\.[0-9]+)?${suffix}$ ]]; then
-            echo "❌ $service 缺少固定版本：请指定 $option 或 UPDATE_RELEASE_VERSION，或在 .env 保留有效 $key；latest/dev 等浮动标签不能用于应用更新" >&2
-            return 1
-        fi
-        APPLICATION_VERSION_WRITES+=("$key=$value")
-    done <<< "$APPLICATION_VERSION_MAP"
-    if [ -n "${UPDATE_RELEASE_VERSION:-}" ] && application_selected easyai-server && application_selected easyai-web; then
-        # VERSION 仍保留兼容入口；改变它前先冻结未选中服务的旧继承值。
-        old_default="$(read_env_value "$file" VERSION)"
-        while read -r service key option image; do
-            application_selected "$service" && continue
-            value="$(read_env_value "$file" "$key")"
-            if [ -z "$value" ] && [ -n "$old_default" ]; then APPLICATION_VERSION_WRITES+=("$key=$old_default"); fi
-        done <<< "$APPLICATION_VERSION_MAP"
-        APPLICATION_VERSION_WRITES+=("VERSION=$UPDATE_RELEASE_VERSION")
+init_deployment_release_source() {
+    local file="$1" mode
+    if [ "${UPDATE_MANIFEST_SOURCE+x}" = x ]; then
+        mode="$(printf '%s' "${UPDATE_MANIFEST_SOURCE:-remote}" | tr '[:upper:]' '[:lower:]')"
+        write_env_value "$file" UPDATE_MANIFEST_SOURCE "$mode"
    fi
+    if [ "${UPDATE_MANIFEST_URL+x}" = x ]; then write_env_value "$file" UPDATE_MANIFEST_URL "$UPDATE_MANIFEST_URL"; fi
+}
+
+plan_application_versions() {
+    local file="$1" plan entry resolver_root
+    resolver_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+    APPLICATION_VERSION_WRITES=()
+    plan="$(python3 "$resolver_root/scripts/resolve-deployment-release.py" --root "$resolver_root" --env-file "$file")" || return 1
+    while IFS= read -r entry; do
+        [ -z "$entry" ] || APPLICATION_VERSION_WRITES+=("$entry")
+    done <<< "$plan"
 }

 apply_application_versions() {