fix(ci): ACR 临时切回默认域名 registry.cn-hangzhou.aliyuncs.com（自定义域名 114.55.99.108:443 拒绝连接）

- .gitea/workflows/*.yml: docker login/REGISTRY/ACR_IMAGE/ACR_REGISTRY
- scripts/ci/*.sh, scripts/ci/*.py: ACR_REGISTRY/GRAY_REGISTRY/REGISTRY 默认值
- 共 12 个文件 31 处替换
- 待 ACR 自定义域名恢复后可切回

scripts/ci/acr_cleanup.py

@@ -40,7 +40,7 @@ from datetime import UTC, datetime, timedelta
 
 # ========== 配置 ==========
 
-REGISTRY = os.environ.get("ACR_REGISTRY", "xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com")
+REGISTRY = os.environ.get("ACR_REGISTRY", "registry.cn-hangzhou.aliyuncs.com")
 AUTH_URL = "https://dockerauth.cn-hangzhou.aliyuncs.com/auth"
 SERVICE = os.environ.get("ACR_SERVICE", "registry.aliyuncs.com:cn-hangzhou:china:cri-fvec8o9q4mmxrkaa")
 NAMESPACE = os.environ.get("ACR_NAMESPACE", "xiaoxiakeji")

scripts/ci/canary_release.sh

@@ -38,9 +38,9 @@ PRODUCTION_SSH_HOST="${PRODUCTION_SSH_HOST:-47.98.113.167}"
 PRODUCTION_SSH_USER="${PRODUCTION_SSH_USER:-root}"
 PRODUCTION_SSH_PORT="${PRODUCTION_SSH_PORT:-22222}"
 # gray_deploy.sh 的镜像命名格式是 ${REGISTRY}-component:tag
-# 需要与 ACR 镜像名 xiaoxia-registry.../xiaoxiakeji/xiaoxia-saas-api:tag 匹配
-GRAY_REGISTRY="${GRAY_REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/xiaoxia-saas}"
-ACR_REGISTRY_HOST="${ACR_REGISTRY_HOST:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com}"
+# 需要与 ACR 镜像名 registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji/xiaoxia-saas-api:tag 匹配
+GRAY_REGISTRY="${GRAY_REGISTRY:-registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji/xiaoxia-saas}"
+ACR_REGISTRY_HOST="${ACR_REGISTRY_HOST:-registry.cn-hangzhou.aliyuncs.com}"
 ACR_USERNAME="${ACR_USERNAME:-}"
 ACR_PASSWORD="${ACR_PASSWORD:-}"
 SKIP_ROLLBACK="${SKIP_ROLLBACK:-false}"

scripts/ci/rebuild-api-base-image.sh

@@ -10,7 +10,7 @@ set -euo pipefail
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
 
-REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
+REGISTRY="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji"
 IMAGE_NAME="saas-api-base"
 TAG="latest"
 FULL_TAG="${REGISTRY}/${IMAGE_NAME}:${TAG}"

scripts/ci/retag_skipped_image.sh

@@ -2,7 +2,7 @@
 # CI 步骤：未重建的镜像，把 registry 上一个分支 tag 复制为新 SHA tag
 # 保证 deploy-staging 的 Watchtower 链路三个镜像都有新 SHA 可拉
 # 用法: bash scripts/ci/retag_skipped_image.sh <image_full_name> <new_sha> <branch>
-# 例:   bash scripts/ci/retag_skipped_image.sh xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/xiaoxia-saas-web <sha> develop
+# 例:   bash scripts/ci/retag_skipped_image.sh registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji/xiaoxia-saas-web <sha> develop
 set -eu
 
 IMAGE="$1"

scripts/ci/sync_base_images.sh

@@ -7,7 +7,7 @@
 
 set -euo pipefail
 
-ACR_REGISTRY="${ACR_REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
+ACR_REGISTRY="${ACR_REGISTRY:-registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji}"
 ACR_USERNAME="${ACR_USERNAME:-}"
 ACR_PASSWORD="${ACR_PASSWORD:-}"
 SOURCE_PREFIX="${SOURCE_PREFIX:-docker.m.daocloud.io/library}"

scripts/ci_production_deploy.sh

@@ -7,7 +7,7 @@
 # 环境变量:
 #   IMAGE_TAG       - 镜像版本 tag（如 commit SHA 或分支名）
 #   REGISTRY_TOKEN  - Registry 访问令牌
-#   REGISTRY        - Registry 地址（默认 xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji）
+#   REGISTRY        - Registry 地址（默认 registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji）
 #   REGISTRY_USER   - Registry 用户名（默认 xiaoxia）
 #   ENV_FILE        - 环境变量文件路径
 #   GENERATED_DIR   - 生成文件目录
@@ -52,7 +52,7 @@ retry_docker_pull() {
 }
 
 IMAGE_TAG="${IMAGE_TAG:-}"
-REGISTRY="${REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
+REGISTRY="${REGISTRY:-registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji}"
 REGISTRY_USER="${ACR_USERNAME:-${REGISTRY_USER:-nick0415343655}}"
 REGISTRY_TOKEN="${ACR_PASSWORD:-${REGISTRY_TOKEN:-}}"
 

scripts/ci_production_healthcheck.sh

@@ -44,7 +44,7 @@ PRODUCTION_SSH_HOST="${PRODUCTION_SSH_HOST:-47.98.113.167}"
 PRODUCTION_SSH_USER="${PRODUCTION_SSH_USER:-root}"
 PRODUCTION_SSH_PORT="${PRODUCTION_SSH_PORT:-22222}"
 
-REGISTRY="${REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
+REGISTRY="${REGISTRY:-registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji}"
 REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
 
 # 颜色
@@ -232,7 +232,7 @@ set -eu
 
 IMAGE_TAG="$1"
 REGISTRY_TOKEN="$2"
-REGISTRY="${REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
+REGISTRY="${REGISTRY:-registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji}"
 REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"
 
 ENV_FILE="${ENV_FILE:-/var/lib/xiaoxia-saas-production/.env}"

scripts/ci_staging_deploy.sh

@@ -39,7 +39,7 @@ retry_docker_pull() {
 }
 
 IMAGE_TAG="${IMAGE_TAG:-}"
-REGISTRY="${REGISTRY:-xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji}"
+REGISTRY="${REGISTRY:-registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji}"
 REGISTRY_USER="${ACR_USERNAME:-${REGISTRY_USER:-nick0415343655}}"
 REGISTRY_TOKEN="${ACR_PASSWORD:-${REGISTRY_TOKEN:-}}"