ddev auth ssh should all available private keys, fixes #1291, fixes #…

…1282 (#1295)

containers/ddev-ssh-agent/Dockerfile

@@ -28,6 +28,7 @@ FROM alpine:3.8
 RUN apk add --no-cache \
 	bash \
 	expect \
+	file \
 	openssh \
 	socat \
 	sudo \

containers/ddev-ssh-agent/files/entry.sh

@@ -49,16 +49,15 @@ case "$1" in
   ;;
 
 	# Manage SSH identities
-	ssh-add)
+  ssh-add)
   shift # remove argument from array
 
   # Add keys id_rsa and id_dsa from /root/.ssh using cat so it will work regardless of permissions
   # docker toolbox mounts files as 0777, which ruins the normal technique.
   set +o errexit
-  keyfiles=$( \ls ~/.ssh/id_[rs]sa 2>/dev/null)
+  keyfiles=$(file ~/.ssh/* | awk -F: '/private key/ {  print $1 }')
   set -o errexit
-  true
-  if [ $keyfiles ] ; then
+  if [ ! -z "$keyfiles" ] ; then
       for key in $keyfiles; do
         perm=$(stat -c %a "$key")
         if [ $perm = "777" ] ; then
@@ -68,7 +67,7 @@ case "$1" in
         fi
       done
   else
-    echo "No keys matching id_[rd]sa were found in the directory."
+    echo "No private keys were found in the directory."
   fi
 
   # Return first command exit code

pkg/version/version.go

@@ -49,7 +49,7 @@ var RouterTag = "v1.4.0" // Note that this can be overridden by make
 
 var SSHAuthImage = "drud/ddev-ssh-agent"
 
-var SSHAuthTag = "v1.4.0"
+var SSHAuthTag = "20181122_load_all_keys"
 
 // COMMIT is the actual committish, supplied by make
 var COMMIT = "COMMIT should be overridden"