Ensure that the generate test SSH pubkey is copied into the ssh-mount-dummy before the mount test is conducted

Author: rasmunk

.gocd/key-auth.sh

@@ -34,7 +34,7 @@ if [ ! -r $TEST_SSH_KEY_PATH ]; then
 fi
 
 # Read in the public key
-MOUNT_SSH_PUB_KEY_CONTENT=`cat $TEST_SSH_KEY_PATH`
+MOUNT_SSH_PUB_KEY_CONTENT=`cat $TEST_SSH_KEY_PATH.pub`
 
 # make the plugin
 PLUGIN_TAG=$TAG make
@@ -44,13 +44,16 @@ docker plugin enable $SSH_MOUNT_PLUGIN
 docker plugin ls
 # start sshd
 docker run -d -p $MOUNT_PORT:22 --name $SSH_MOUNT_CONTAINER $DOCKER_SSH_MOUNT_IMAGE
-# Copy in the public key
-docker exec -it $SSH_MOUNT_CONTAINER bash -c "echo $MOUNT_SSH_PUB_KEY_CONTENT >> $MOUNT_PATH/.ssh/authorized_keys"
-
 # It takes a while for the container to start and be ready to accept connection
 # TODO, check when container is ready instead of sleeping
 sleep 20
 
+# Copy in the public key
+# Write a newline followed by the public key
+# https://unix.stackexchange.com/questions/191694/how-to-put-a-newline-special-character-into-a-file-using-the-echo-command-and-re
+docker exec -it $SSH_MOUNT_CONTAINER bash -c $"echo \n >> $MOUNT_PATH/.ssh/authorized_keys"
+docker exec -it $SSH_MOUNT_CONTAINER bash -c "echo $MOUNT_SSH_PUB_KEY_CONTENT >> $MOUNT_PATH/.ssh/authorized_keys"
+
 # test1: ssh key
 docker plugin disable $SSH_MOUNT_PLUGIN
 docker plugin set $SSH_MOUNT_PLUGIN sshkey.source=$TEST_SSH_KEY_DIRECTORY

README.md

@@ -61,9 +61,9 @@ docker plugin install ucphhpc/sshfs state.source=<any_folder> sshkey.source=/hom
 
 2 - Create a volume
 
-> Make sure the ***source path on the ssh server was exists***.
+> Make sure the ***source path on the ssh server exists***.
 > 
-> Or you'll be failed while use/mount the volume.
+> Or you will fail when you use/mount the volume.
 
 ```
 $ docker volume create -d ucphhpc/sshfs -o sshcmd=<user@host:path> [-o IdentityFile=/root/.ssh/<key>] [-o port=<port>] [-o <any_sshfs_-o_option> ] sshvolume