Merge pull request #3 from bavery22/FixSoftLink
authorSebastien D <seb.douheret@gmail.com>
Mon, 13 Nov 2017 10:39:48 +0000 (11:39 +0100)
committerGitHub <noreply@github.com>
Mon, 13 Nov 2017 10:39:48 +0000 (11:39 +0100)
Fix case where ~/.ssh/id_rsa.pub is a softlink

scripts/xds-docker-create-container.sh

index 88c74eb..3f5fe5f 100755 (executable)
@@ -174,7 +174,7 @@ echo
 [ -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 cp -L ~/.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 -n -o StrictHostKeyChecking=no -p $SSH_PORT $DOCKER_USER@localhost exit || exit 1