Merge pull request #226 from SvenDowideit/add-b2d-shellinit-cmd

Add b2d shellinit cmd

Author: Sven Dowideit

cmds.go

@@ -73,7 +73,7 @@ func cmdUp() error {
 	certPath, err := RequestCertsUsingSSH(m)
 	if err != nil && B2D.Verbose {
 		// These errors are not fatal
-		fmt.Printf("Error copying Certificates: %s\n", err)
+		fmt.Fprintf(os.Stderr, "Error copying Certificates: %s\n", err)
 	}
 	switch runtime.GOOS {
 	case "windows":
@@ -89,15 +89,7 @@ func cmdUp() error {
 			socket := RequestSocketFromSSH(m)
 			if os.Getenv("DOCKER_HOST") != socket || os.Getenv("DOCKER_CERT_PATH") != certPath {
 				fmt.Printf("\nTo connect the Docker client to the Docker daemon, please set:\n")
-				fmt.Printf("    export DOCKER_HOST=%s\n", socket)
-				if certPath == "" {
-					if os.Getenv("DOCKER_CERT_PATH") != "" {
-						fmt.Println("    unset DOCKER_CERT_PATH")
-					}
-				} else {
-					// Assume Docker 1.2.0 with TLS on...
-					fmt.Printf("    export DOCKER_CERT_PATH=%s\n", certPath)
-				}
+				printExport(socket, certPath)
 			} else {
 				fmt.Printf("Your DOCKER_HOST env variable is already set correctly.\n")
 			}
@@ -107,6 +99,41 @@ func cmdUp() error {
 	return nil
 }
 
+// Give the user the exact command to run to set the env.
+func cmdShellInit() error {
+	m, err := driver.GetMachine(&B2D)
+	if err != nil {
+		return fmt.Errorf("Failed to get machine %q: %s", B2D.VM, err)
+	}
+
+	if m.GetState() != driver.Running {
+		return fmt.Errorf("VM %q is not running.", B2D.VM)
+	}
+
+	socket := RequestSocketFromSSH(m)
+
+	certPath, err := RequestCertsUsingSSH(m)
+	if err != nil && B2D.Verbose {
+		// These errors are not fatal
+		fmt.Fprintf(os.Stderr, "Error copying Certificates: %s\n", err)
+	}
+	printExport(socket, certPath)
+
+	return nil
+}
+
+func printExport(socket, certPath string) {
+	fmt.Printf("    export DOCKER_HOST=%s\n", socket)
+	if certPath == "" {
+		if os.Getenv("DOCKER_CERT_PATH") != "" {
+			fmt.Println("    unset DOCKER_CERT_PATH")
+		}
+	} else {
+		// Assume Docker 1.2.0 with TLS on...
+		fmt.Printf("    export DOCKER_CERT_PATH=%s\n", certPath)
+	}
+}
+
 // Tell the user the config (and later let them set it?)
 func cmdConfig() error {
 	dir, err := cfgDir(".boot2docker")
@@ -243,10 +270,10 @@ func cmdSocket() error {
 		return fmt.Errorf("VM %q is not running.", B2D.VM)
 	}
 
-	Socket := RequestSocketFromSSH(m)
+	socket := RequestSocketFromSSH(m)
 
 	fmt.Fprintf(os.Stderr, "\n\t export DOCKER_HOST=")
-	fmt.Printf("%s", Socket)
+	fmt.Printf("%s", socket)
 	fmt.Fprintf(os.Stderr, "\n\n")
 
 	return nil

config.go

@@ -175,7 +175,7 @@ func config() (*flag.FlagSet, error) {
 }
 
 func usageShort() {
-	fmt.Fprintf(os.Stderr, "Usage: %s [<options>] {help|init|up|ssh|save|down|poweroff|reset|restart|config|status|info|ip|socket|delete|destroy|download|version} [<args>]\n", os.Args[0])
+	fmt.Fprintf(os.Stderr, "Usage: %s [<options>] {help|init|up|ssh|save|down|poweroff|reset|restart|config|status|info|ip|socket|shellinit|delete|destroy|download|version} [<args>]\n", os.Args[0])
 }
 
 func usageLong(flags *flag.FlagSet) {
@@ -198,6 +198,7 @@ Commands:
     info                    Display detailed information of VM.
     ip                      Display the IP address of the VM's Host-only network.
     socket                  Display the DOCKER_HOST socket to connect to.
+    shellinit               Display the Environment export shell command needed to set up the Docker client.
     status                  Display current state of VM.
     download                Download boot2docker ISO image.
     upgrade                 Upgrade the boot2docker ISO image (if vm is running it will be stopped and started).

main.go

@@ -67,6 +67,8 @@ func run() error {
 		return cmdInfo()
 	case "socket":
 		return cmdSocket()
+	case "shellinit":
+		return cmdShellInit()
 	case "status":
 		return cmdStatus()
 	case "ssh":

util.go

@@ -297,6 +297,11 @@ func RequestIPFromSerialPort(socket string) string {
 }
 
 // TODO: need to add or abstract to get a Serial coms version
+// RequestCertsUsingSSH requests certs using SSH. 
+// The assumption is that if the certs are in b2d:/home/docker/.docker
+// then the daemon is using TLS. We can't assume that because there are
+// certs in the local host's user dir, that the server is using them, so
+// for now, make sure things are updated from the server. (for `docker shellinit`)
 func RequestCertsUsingSSH(m driver.Machine) (string, error) {
 	cmd := getSSHCommand(m, "tar c /home/docker/.docker/*.pem")