修复开发部署 SSH 指纹读取
This commit is contained in:
@@ -13,6 +13,7 @@ ENV_FILE="$4"
|
|||||||
|
|
||||||
SSH_TARGET="${DEVELOPMENT_SSH_TARGET:-deploy@172.31.198.8}"
|
SSH_TARGET="${DEVELOPMENT_SSH_TARGET:-deploy@172.31.198.8}"
|
||||||
SSH_KEY="${DEVELOPMENT_SSH_KEY:-/var/jenkins_home/.ssh/dev_deploy}"
|
SSH_KEY="${DEVELOPMENT_SSH_KEY:-/var/jenkins_home/.ssh/dev_deploy}"
|
||||||
|
SSH_KNOWN_HOSTS="${DEVELOPMENT_SSH_KNOWN_HOSTS:-/var/jenkins_home/.ssh/known_hosts}"
|
||||||
REMOTE_DIR="${DEVELOPMENT_DEPLOY_DIR:-/opt/firstleg/application}"
|
REMOTE_DIR="${DEVELOPMENT_DEPLOY_DIR:-/opt/firstleg/application}"
|
||||||
COMPOSE_FILE="deploy/docker-compose.yml"
|
COMPOSE_FILE="deploy/docker-compose.yml"
|
||||||
|
|
||||||
@@ -20,6 +21,10 @@ if [ ! -f "$SSH_KEY" ]; then
|
|||||||
echo "开发环境 SSH 私钥不存在: $SSH_KEY" >&2
|
echo "开发环境 SSH 私钥不存在: $SSH_KEY" >&2
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
if [ ! -f "$SSH_KNOWN_HOSTS" ]; then
|
||||||
|
echo "SSH 主机指纹文件不存在: $SSH_KNOWN_HOSTS" >&2
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
if [ ! -f "$ENV_FILE" ]; then
|
if [ ! -f "$ENV_FILE" ]; then
|
||||||
echo "开发环境变量文件不存在: $ENV_FILE" >&2
|
echo "开发环境变量文件不存在: $ENV_FILE" >&2
|
||||||
exit 2
|
exit 2
|
||||||
@@ -43,6 +48,7 @@ run_ssh() {
|
|||||||
ssh -i "$SSH_KEY" \
|
ssh -i "$SSH_KEY" \
|
||||||
-o BatchMode=yes \
|
-o BatchMode=yes \
|
||||||
-o StrictHostKeyChecking=yes \
|
-o StrictHostKeyChecking=yes \
|
||||||
|
-o UserKnownHostsFile="$SSH_KNOWN_HOSTS" \
|
||||||
-o ConnectTimeout=10 \
|
-o ConnectTimeout=10 \
|
||||||
"$SSH_TARGET" "$@"
|
"$SSH_TARGET" "$@"
|
||||||
}
|
}
|
||||||
@@ -51,6 +57,7 @@ run_scp() {
|
|||||||
scp -i "$SSH_KEY" \
|
scp -i "$SSH_KEY" \
|
||||||
-o BatchMode=yes \
|
-o BatchMode=yes \
|
||||||
-o StrictHostKeyChecking=yes \
|
-o StrictHostKeyChecking=yes \
|
||||||
|
-o UserKnownHostsFile="$SSH_KNOWN_HOSTS" \
|
||||||
-o ConnectTimeout=10 \
|
-o ConnectTimeout=10 \
|
||||||
"$@"
|
"$@"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user