clean up tls for #13

README.md

@@ -5,14 +5,14 @@ blimp
 
 Mechanism to easily move a container from one Docker host to another, show containers running against all of your hosts, replicate a container across multiple hosts and more.
 
-Relies on the `docker hosts` feature proposed in docker#8681 and laid out in this branch: https://github.com/bfirsh/docker/tree/host-management
+Relies on the `docker machines` feature proposed in docker#8681 and laid out in this branch: https://github.com/bfirsh/docker/tree/host-management
 
 See it in action: https://www.youtube.com/watch?v=L66f5kkN7W8
 
 environment
 =======
 
-The environment variable `DOCKER_BINARY` can be set to a specific path for an alternate or path-specific docker binary. Often needed if you have built the branch for `docker hosts` capability on a shared system.
+The environment variable `DOCKER_BINARY` can be set to a specific path for an alternate or path-specific docker binary. Often needed if you have built the branch for `docker machines` capability on a shared system.
 
 install
 =======
@@ -21,7 +21,7 @@ dependencies: curl, perl
 
 build docker from the `host-management` branch of `@bfirsh`'s fork from here: https://github.com/bfirsh/docker/tree/host-management
 
-add some hosts using `docker hosts`
+add some hosts using `docker machines`
 
 `git clone https://github.com/tubesandlube/blimp.git`
 

bin/blimp

@@ -3,7 +3,7 @@
 # Assumptions:
 #   docker is running -dev w/ the `machines` command available
 #
-#   All docker hosts attached are pointing to the same registry, and
+#   All docker machines attached are pointing to the same registry, and
 #   that the original container was booted from an image there
 #
 #   You are running this from the directory where blimp exists; need to
@@ -17,6 +17,10 @@
 #   username setup, you can add it as a parameter for 'Host' in your
 #   ~/.ssh/config
 #
+#   You have setup TLS authentication for client authentication against
+#   the hosts using docker machines.  Documentation at this url and within
+#   the `docs` dir in the source: https://docs.docker.com/articles/https/
+#
 # To do:
 # 
 #   address dupe container name possibility, take container ids...
@@ -51,6 +55,12 @@ require hosts;
 require logger;
 require volumes;
 
+# setup default TLS auth
+$ENV{'DOCKER_AUTH'}      = $ENV{'DOCKER_AUTH'}      || "cert";
+$ENV{'DOCKER_AUTH_CA'}   = $ENV{'DOCKER_AUTH_CA'}   || "~/.docker/ca.pem";
+$ENV{'DOCKER_AUTH_CERT'} = $ENV{'DOCKER_AUTH_CERT'} || "~/.docker/cert.pem";
+$ENV{'DOCKER_AUTH_KEY'}  = $ENV{'DOCKER_AUTH_KEY'}  || "~/.docker/key.pem";
+
 my $argnum;
 my @args;
 my $c;