diff options
| author |   Sebastien D <seb.douheret@gmail.com> | 2017-11-13 11:39:48 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-11-13 11:39:48 +0100 |
| commit | 715e52f2b5bcb4c195039e1269c872bc8761a3c6 (patch) | |
| tree | 7e9394dfff56ab6abad381f8c83ab456937458f0 | |
| parent | 68afbf4a2573e726a0987759be4d74bb693670b3 (diff) | |
| parent | 4668cb0fe680bb43dbbbce661c2c53c9762c0546 (diff) | |
Merge pull request #3 from bavery22/FixSoftLink
Fix case where ~/.ssh/id_rsa.pub is a softlink
| -rwxr-xr-x | scripts/xds-docker-create-container.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/xds-docker-create-container.sh b/scripts/xds-docker-create-container.sh index 88c74eb..3f5fe5f 100755 --- a/scripts/xds-docker-create-container.sh +++ b/scripts/xds-docker-create-container.sh @@ -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 |