From 2d3cb13707cbb9754cb219d1454f9e0e7f4de2ee Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Sun, 27 Sep 2026 17:42:17 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BF=AE=E6=AD=A3=20staging=20=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=83=A8=E7=BD=B2=E7=9B=AE=E6=A0=87=E4=B8=BA=20116.62?= =?UTF-8?q?.226.203:22=EF=BC=88staging=E4=B8=9A=E5=8A=A1=E6=9C=BA=EF=BC=89?= =?UTF-8?q?=20(#2065)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: xiaoxia Co-committed-by: xiaoxia --- .gitea/workflows/ci-pipeline.yml | 8 ++++---- scripts/ci_staging_healthcheck.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/ci-pipeline.yml b/.gitea/workflows/ci-pipeline.yml index 57f7ceab4..20878d205 100755 --- a/.gitea/workflows/ci-pipeline.yml +++ b/.gitea/workflows/ci-pipeline.yml @@ -1238,13 +1238,13 @@ jobs: ACR_PASSWORD: "${{ secrets.ACR_PASSWORD }}" run: | set -eux - # Staging 业务机 = 47.98.113.167（公网 sshd 端口 22222；22 被云盾策略限制）。 - # 116.62.226.203 现为独立 CI runner，不承载业务容器。 + # Staging 业务机 = 116.62.226.203（公网 sshd 端口 22）。 + # 47.98.113.167 现为生产机（sshd 端口 22222），不承载 staging 容器。 # CI job 在隔离容器网络内执行，127.0.0.1 会指向 job 容器自身而失败， # 故默认目标必须是 staging 业务机；仍可通过 secrets 覆盖。 - staging_host="${STAGING_SSH_HOST:-47.98.113.167}" + staging_host="${STAGING_SSH_HOST:-116.62.226.203}" staging_user="${STAGING_SSH_USER:-root}" - staging_port="${STAGING_SSH_PORT:-22222}" + staging_port="${STAGING_SSH_PORT:-22}" echo "Host: $staging_host" echo "Port: $staging_port" diff --git a/scripts/ci_staging_healthcheck.sh b/scripts/ci_staging_healthcheck.sh index fbd9cd95d..5c56d9550 100644 --- a/scripts/ci_staging_healthcheck.sh +++ b/scripts/ci_staging_healthcheck.sh @@ -17,9 +17,9 @@ # SKIP_NOTIFY - 跳过通知 (true/false, 默认 false) # CI_NOTIFY_WEBHOOK - 通知 Webhook URL # -# STAGING_SSH_HOST - Staging 服务器 SSH 地址 (默认 47.98.113.167（业务机公网IP）) +# STAGING_SSH_HOST - Staging 服务器 SSH 地址 (默认 116.62.226.203（staging业务机公网IP）) # STAGING_SSH_USER - SSH 用户名 (默认 root) -# STAGING_SSH_PORT - SSH 端口 (默认 22222（公网端口）；22 被云盾策略限制) +# STAGING_SSH_PORT - SSH 端口 (默认 22) # STAGING_SSH_KEY - SSH 私钥内容 # REGISTRY_TOKEN - Registry Token（回滚时拉取旧镜像需要） # @@ -40,9 +40,9 @@ HEALTH_CHECK_TIMEOUT="${HEALTH_CHECK_TIMEOUT:-120}" SKIP_ROLLBACK="${SKIP_ROLLBACK:-false}" SKIP_NOTIFY="${SKIP_NOTIFY:-false}" -STAGING_SSH_HOST="${STAGING_SSH_HOST:-47.98.113.167}" +STAGING_SSH_HOST="${STAGING_SSH_HOST:-116.62.226.203}" STAGING_SSH_USER="${STAGING_SSH_USER:-root}" -STAGING_SSH_PORT="${STAGING_SSH_PORT:-22222}" +STAGING_SSH_PORT="${STAGING_SSH_PORT:-22}" REGISTRY="${REGISTRY:-git.xiaoxiajianji.com/xiaoxia/xiaoxia-saas}" REGISTRY_USER="${REGISTRY_USER:-xiaoxia}"