Merge pull request docker-archive#409 from docker/fixsshddc

Fix ssh container, generate ssh host key

Author: nathanleclaire

aws/cloudformation/docker_for_aws_cloud.json

@@ -611,13 +611,23 @@
                                 "-v /usr/bin/docker:/usr/bin/docker ",
                                 "docker4x/guide-aws:$DOCKER_FOR_IAAS_VERSION\n",
 
+                                "docker volume create --name sshkey\n",
+
+                                "docker run --log-driver=json-file -ti --rm ",
+                                "--user root ",
+                                "-v sshkey:/etc/ssh ",
+                                "--entrypoint ssh-keygen ",
+                                "docker4x/shell-aws:$DOCKER_FOR_IAAS_VERSION ",
+                                "-A\n",
+
                                 "docker run --log-driver=json-file --name=shell-aws --restart=always -d -p 22:22 ",
                                 "-v /home/docker/:/home/docker/ ",
                                 "-v /var/run/docker.sock:/var/run/docker.sock ",
                                 "-v /var/lib/docker/swarm/lb_name:/var/lib/docker/swarm/lb_name:ro ",
                                 "-v /var/lib/docker/swarm/elb.config:/var/lib/docker/swarm/elb.config ",
                                 "-v /usr/bin/docker:/usr/bin/docker ",
                                 "-v /var/log:/var/log ",
+                                "-v sshkey:/etc/ssh ",
                                 "-v /etc/passwd:/etc/passwd:ro ",
                                 "-v /etc/shadow:/etc/shadow:ro ",
                                 "-v /etc/group:/etc/group:ro ",

aws/cloudformation/docker_for_aws_ddc.json

@@ -612,13 +612,23 @@
                                 "-v /usr/bin/docker:/usr/bin/docker ",
                                 "docker4x/guide-aws:$DOCKER_FOR_IAAS_VERSION\n",
 
+                                "docker volume create --name sshkey\n",
+
+                                "docker run --log-driver=json-file -ti --rm ",
+                                "--user root ",
+                                "-v sshkey:/etc/ssh ",
+                                "--entrypoint ssh-keygen ",
+                                "docker4x/shell-aws:$DOCKER_FOR_IAAS_VERSION ",
+                                "-A\n",
+
                                 "docker run --log-driver=json-file --name=shell-aws --restart=always -d -p 22:22 ",
                                 "-v /home/docker/:/home/docker/ ",
                                 "-v /var/run/docker.sock:/var/run/docker.sock ",
                                 "-v /var/lib/docker/swarm/lb_name:/var/lib/docker/swarm/lb_name:ro ",
                                 "-v /var/lib/docker/swarm/elb.config:/var/lib/docker/swarm/elb.config ",
                                 "-v /usr/bin/docker:/usr/bin/docker ",
                                 "-v /var/log:/var/log ",
+                                "-v sshkey:/etc/ssh ",
                                 "-v /etc/passwd:/etc/passwd:ro ",
                                 "-v /etc/shadow:/etc/shadow:ro ",
                                 "-v /etc/group:/etc/group:ro ",
@@ -629,7 +639,7 @@
                                 "-v /var/lib/docker/swarm:/var/lib/docker/swarm ",
                                 "docker4x/l4controller-aws:$DOCKER_FOR_IAAS_VERSION run --log=4 --all=true\n",
 
-                                "docker run --log-driver=json-file --name=ddc-init-aws --restart=no --rm",
+                                "docker run --log-driver=json-file --name=ddc-init-aws --restart=no --rm ",
                                 "-e NODE_TYPE='manager' ",
                                 "-e STACK_NAME='",{ "Ref" : "AWS::StackName" }, "' ",
                                 "-e REGION='",{ "Ref" : "AWS::Region" }, "' ",