diff --git a/.gitea/workflows/cd.yaml b/.gitea/workflows/cd.yaml index 4206c111..753799c5 100644 --- a/.gitea/workflows/cd.yaml +++ b/.gitea/workflows/cd.yaml @@ -812,7 +812,7 @@ jobs: chmod 600 "${HOME}/.ssh/deploy_key_188" timeout -k 5s 10s ssh-keyscan 192.168.0.188 >> ~/.ssh/known_hosts 2>/dev/null \ || echo "⚠️ 188 host key scan 失敗,改用 StrictHostKeyChecking=accept-new" - SSH_188_OPTS=( + SSH_188_COMMON_OPTS=( -i "${HOME}/.ssh/deploy_key_188" -o BatchMode=yes -o StrictHostKeyChecking=accept-new @@ -820,22 +820,29 @@ jobs: -o ServerAliveInterval=10 -o ServerAliveCountMax=3 -o LogLevel=ERROR + ) + SSH_188_OPTS=( + "${SSH_188_COMMON_OPTS[@]}" -n ) + # scp 不支援 ssh 的 -n 參數,避免 188 ops 腳本同步被參數解析擋下。 + SCP_188_OPTS=( + "${SSH_188_COMMON_OPTS[@]}" + ) timeout -k 5s 30s ssh "${SSH_188_OPTS[@]}" ollama@192.168.0.188 \ "mkdir -p ~/awoooi-ops" \ || echo "⚠️ 188 ops 目錄確認失敗" # 同步 docker-health-monitor.sh - timeout -k 5s 60s scp "${SSH_188_OPTS[@]}" \ + timeout -k 5s 60s scp "${SCP_188_OPTS[@]}" \ scripts/ops/docker-health-monitor.sh \ ollama@192.168.0.188:~/awoooi-ops/docker-health-monitor.sh \ && echo "✅ docker-health-monitor.sh 已同步" \ || echo "⚠️ docker-health-monitor.sh 同步失敗" # 同步 pg-backup.sh - timeout -k 5s 60s scp "${SSH_188_OPTS[@]}" \ + timeout -k 5s 60s scp "${SCP_188_OPTS[@]}" \ scripts/ops/pg-backup.sh \ ollama@192.168.0.188:~/awoooi-ops/pg-backup.sh \ && echo "✅ pg-backup.sh 已同步" \