xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 16 Pull Requests 9 Actions 34.2k Packages Projects Releases 7 Wiki Activity

fix(ci): ACR 临时切回默认域名 registry.cn-hangzhou.aliyuncs.com（自定义域名 114.55.99.108:443 拒绝连接）
CI/CD Pipeline / Check if frontend-only change (push) Has been skipped
Details
CI/CD Pipeline / Dedup Check - skip PR tests when covered by push pipeline (push) Successful in 1s
Details
CI/CD Pipeline / Check push changed paths (push) Successful in 2s
Details
CI/CD Pipeline / Frontend Lint (push) Has been skipped
Details
CI/CD Pipeline / PR Build API Image (push) Has been skipped
Details
CI/CD Pipeline / PR Build Web Image (push) Has been skipped
Details
CI/CD Pipeline / PR Build Worker Image (push) Has been skipped
Details
CI/CD Pipeline / Build Staging API Image (push) Failing after 1m11s
Details
CI/CD Pipeline / Validate - Python (mypy + alembic) (push) Successful in 3m23s
Details
CI/CD Pipeline / Integration Tests (push) Successful in 3m27s
Details
CI/CD Pipeline / Build Staging Web Image (push) Failing after 3m31s
Details
CI/CD Pipeline / Validate - Style (push) Successful in 4m5s
Details
CI/CD Pipeline / Frontend Unit Tests (push) Successful in 5m17s
Details
CI/CD Pipeline / Validate - Security (push) Successful in 7m6s
Details
CI/CD Pipeline / Build Staging Worker Image (push) Failing after 9m22s
Details
CI/CD Pipeline / Retag skipped Staging API Image (push) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Worker Image (push) Has been skipped
Details
CI/CD Pipeline / Retag skipped Staging Web Image (push) Has been skipped
Details
CI/CD Pipeline / Unit Tests (push) Successful in 10m10s
Details
CI/CD Pipeline / Build Production API Image (push) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (push) Has been skipped
Details
CI/CD Pipeline / CI Gate (push) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (push) Has been skipped
Details
CI/CD Pipeline / Deploy Production (push) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (push) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Failing after 3m49s
Details
CI/CD Pipeline / Staging E2E Tests (push) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (push) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (push) Has been skipped
Details
CI/CD Pipeline / Canary Release to Production (push) Has been skipped
Details

Browse Source 
- .gitea/workflows/*.yml: docker login/REGISTRY/ACR_IMAGE/ACR_REGISTRY
- scripts/ci/*.sh, scripts/ci/*.py: ACR_REGISTRY/GRAY_REGISTRY/REGISTRY 默认值
- 共 12 个文件 31 处替换
- 待 ACR 自定义域名恢复后可切回
This commit is contained in:
saas-backend-agent
2026-09-17 07:16:08 +08:00
parent b68c29c69b
commit 30bf66b307
12 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/acr-cleanup.yml
+1 -1
View File
@@ -29,7 +29,7 @@ jobs:
permissions:
contents: read
env:
ACR_REGISTRY: xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com
ACR_REGISTRY: registry.cn-hangzhou.aliyuncs.com
ACR_NAMESPACE: xiaoxiakeji
ACR_SERVICE: registry.aliyuncs.com:cn-hangzhou:china:cri-fvec8o9q4mmxrkaa
GITEA_URL: https://git.xiaoxiajianji.com
.gitea/workflows/api-base-image.yml
+3 -3
View File
@@ -37,7 +37,7 @@ jobs:
set -eu
for i in 1 2 3; do
echo "=== Docker login 尝试 $i/3 ==="
if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
if printf '%s' "${ACR_PASSWORD}" | docker login registry.cn-hangzhou.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
&& docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
echo "✅ Docker login successful"
break
@@ -50,7 +50,7 @@ jobs:
shell: sh
run: |
set -eu
ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-api-base:latest"
ACR_IMAGE="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji/saas-api-base:latest"
GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia-saas/saas-api-base:latest"
echo "=== Building API base image ==="
@@ -79,6 +79,6 @@ jobs:
if: always()
shell: sh
run: |
ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-api-base:latest"
ACR_IMAGE="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji/saas-api-base:latest"
docker rmi "${ACR_IMAGE}" 2>/dev/null || true
echo "Cleanup done"
.gitea/workflows/ci-pipeline.yml
+12 -12
View File
@@ -778,7 +778,7 @@ jobs:
set -eu
for i in 1 2 3; do
echo "Docker login attempt $i/3"
if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
if printf '%s' "${ACR_PASSWORD}" | docker login registry.cn-hangzhou.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
echo "Docker login successful"
break
fi
@@ -791,7 +791,7 @@ jobs:
shell: sh
run: |
set -eu
REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
REGISTRY="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji"
BASE_IMAGE="${REGISTRY}/saas-worker-base:latest"
# 尝试拉取基础镜像
@@ -809,7 +809,7 @@ jobs:
shell: sh
run: |
set -eu
REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
REGISTRY="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji"
IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:pr-${GITHUB_SHA}"
CACHE_REF="${REGISTRY}/${{ matrix.cache_name }}:develop"
@@ -951,7 +951,7 @@ jobs:
# Docker login 带重试（网络波动时自动重试）
for i in 1 2 3; do
echo "=== Docker login 尝试 $i/3 ==="
if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
if printf '%s' "${ACR_PASSWORD}" | docker login registry.cn-hangzhou.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
echo "✅ Docker login successful"
break
fi
@@ -980,7 +980,7 @@ jobs:
ACR_PASSWORD: "${{ secrets.ACR_PASSWORD }}"
run: |
set -eu
REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
REGISTRY="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji"
BASE_IMAGE="${REGISTRY}/saas-worker-base:latest"
echo "检查 Worker 基础镜像..."
@@ -997,7 +997,7 @@ jobs:
shell: sh
run: |
set -eu
REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
REGISTRY="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji"
IMAGE_FULL="${REGISTRY}/${{ matrix.image_name }}"
IMAGE_TAG="${IMAGE_FULL}:${GITHUB_SHA}"
# 同时推分支 tag，作为未重建镜像 retag 的稳定来源
@@ -1099,7 +1099,7 @@ jobs:
run: |
set -eu
for i in 1 2 3; do
if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
if printf '%s' "${ACR_PASSWORD}" | docker login registry.cn-hangzhou.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
&& docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
echo "✅ Docker login successful"
break
@@ -1111,7 +1111,7 @@ jobs:
shell: sh
run: |
set -eu
REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
REGISTRY="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji"
bash scripts/ci/retag_skipped_image.sh \
"${REGISTRY}/${{ matrix.image_name }}" \
"${GITHUB_SHA}" \
@@ -1208,7 +1208,7 @@ jobs:
# Docker login 带重试（网络波动时自动重试）
for i in 1 2 3; do
echo "=== Docker login 尝试 $i/3 ==="
if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
if printf '%s' "${ACR_PASSWORD}" | docker login registry.cn-hangzhou.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
echo "✅ Docker login successful"
break
fi
@@ -1513,7 +1513,7 @@ jobs:
# Docker login 带重试（网络波动时自动重试）
for i in 1 2 3; do
echo "=== Docker login 尝试 $i/3 ==="
if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
if printf '%s' "${ACR_PASSWORD}" | docker login registry.cn-hangzhou.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin && docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
echo "✅ Docker login successful"
break
fi
@@ -1542,7 +1542,7 @@ jobs:
shell: bash
run: |
set -eu
REGISTRY="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji"
REGISTRY="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji"
# 根据ref类型设置镜像标签：tag用版本号，分支用分支名+sha
TAG_NAME="${GITHUB_SHA}"
IMAGE_TAG="${REGISTRY}/${{ matrix.image_name }}:${TAG_NAME}"
@@ -1831,7 +1831,7 @@ jobs:
- deploy-staging
if: "github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'develop')"
env:
ACR_REGISTRY: xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com
ACR_REGISTRY: registry.cn-hangzhou.aliyuncs.com
ACR_NAMESPACE: xiaoxiakeji
steps:
- name: Checkout code
.gitea/workflows/worker-base-image.yml
+3 -3
View File
@@ -38,7 +38,7 @@ jobs:
set -eu
for i in 1 2 3; do
echo "=== Docker login 尝试 $i/3 ==="
if printf '%s' "${ACR_PASSWORD}" | docker login xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
if printf '%s' "${ACR_PASSWORD}" | docker login registry.cn-hangzhou.aliyuncs.com -u "${ACR_USERNAME}" --password-stdin \
&& docker login git.xiaoxiajianji.com -u "${GITEA_REGISTRY_USER}" -p "${GITEA_REGISTRY_TOKEN}"; then
echo "✅ Docker login successful"
break
@@ -51,7 +51,7 @@ jobs:
shell: sh
run: |
set -eu
ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-worker-base:latest"
ACR_IMAGE="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji/saas-worker-base:latest"
GITEA_IMAGE="git.xiaoxiajianji.com/xiaoxia-saas/saas-worker-base:latest"
echo "=== Building Worker base image ==="
@@ -80,7 +80,7 @@ jobs:
if: always()
shell: sh
run: |
ACR_IMAGE="xiaoxia-registry.cn-hangzhou.cr.aliyuncs.com/xiaoxiakeji/saas-worker-base:latest"
ACR_IMAGE="registry.cn-hangzhou.aliyuncs.com/xiaoxiakeji/saas-worker-base:latest"
docker rmi "${ACR_IMAGE}" 2>/dev/null || true
docker image prune -f 2>/dev/null || true
echo "Cleanup done"
scripts/ci/acr_cleanup.py
+1 -1
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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:-}}"