From 93ec90a0347a7554e4abea36de8aa70b5b954c3d Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Thu, 19 Oct 2017 16:13:53 +0200 Subject: [PATCH] Support case when .ssh and default key dont exist. --- scripts/xds-docker-create-container.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/xds-docker-create-container.sh b/scripts/xds-docker-create-container.sh index 71f4b03..c3c951d 100755 --- a/scripts/xds-docker-create-container.sh +++ b/scripts/xds-docker-create-container.sh @@ -171,11 +171,12 @@ while [ $res -ne 0 ] && [ $count -le $max ]; do done echo -ssh-keygen -R "[localhost]:$SSH_PORT" -f ~/.ssh/known_hosts -docker exec ${NAME} bash -c "mkdir -p /home/$DOCKER_USER/.ssh" -docker cp ~/.ssh/id_rsa.pub ${NAME}:/home/$DOCKER_USER/.ssh/authorized_keys -docker exec ${NAME} bash -c "chown $DOCKER_USER:$DOCKER_USER -R /home/$DOCKER_USER/.ssh ;chmod 0700 /home/$DOCKER_USER/.ssh; chmod 0600 /home/$DOCKER_USER/.ssh/*" -ssh -o StrictHostKeyChecking=no -p $SSH_PORT $DOCKER_USER@localhost exit +[ -f ~/.ssh/known_hosts ] && { ssh-keygen -R "[localhost]:$SSH_PORT" -f ~/.ssh/known_hosts || exit 1; } +[ ! -f ~/.ssh/id_rsa.pub ] && { ssh-keygen -t rsa -f ~/.ssh/id_rsa -P "" > /dev/null || exit 1; } +docker exec ${NAME} bash -c "mkdir -p /home/$DOCKER_USER/.ssh" || exit 1 +docker cp ~/.ssh/id_rsa.pub ${NAME}:/home/$DOCKER_USER/.ssh/authorized_keys || exit 1 +docker exec ${NAME} bash -c "chown $DOCKER_USER:$DOCKER_USER -R /home/$DOCKER_USER/.ssh ;chmod 0700 /home/$DOCKER_USER/.ssh; chmod 0600 /home/$DOCKER_USER/.ssh/*" || exit 1 +ssh -o StrictHostKeyChecking=no -p $SSH_PORT $DOCKER_USER@localhost exit || exit 1 echo "You can now login using:" echo " ssh -p $SSH_PORT $DOCKER_USER@localhost" -- 2.16.6