Merge pull request #218 from SvenDowideit/get-client-certs

Get client certs from vm, and set up the DOCKER_HOST with the real connection string

Author: Sven Dowideit

cmds.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"runtime"
-	"strings"
 	"time"
 
 	_ "github.com/boot2docker/boot2docker-cli/dummy"
@@ -61,44 +60,50 @@ func cmdUp() error {
 	}
 	print("\n")
 
-	fmt.Printf("Started.")
+	fmt.Printf("Started.\n")
 
 	if IP == "" {
 		// lets try one more time
 		time.Sleep(600 * time.Millisecond)
-		fmt.Printf("  Trying to get IP one more time")
+		fmt.Printf("  Trying to get IP one more time\n")
 
 		IP = RequestIPFromSSH(m)
 	}
+	// Copying the certs here - someone might have have written a Windows API client.
+	certPath := RequestCertsUsingSSH(m)
 	switch runtime.GOOS {
 	case "windows":
-		fmt.Printf("Docker client does not run on Windows for now. Please use")
-		fmt.Printf("    \"%s\" ssh", os.Args[0])
-		fmt.Printf("to SSH into the VM instead.")
+		fmt.Printf("Docker client does not run on Windows for now. Please use\n")
+		fmt.Printf("    \"%s\" ssh\n", os.Args[0])
+		fmt.Printf("to SSH into the VM instead.\n")
 	default:
 		if IP == "" {
-			fmt.Fprintf(os.Stderr, "Auto detection of the VM's IP address failed.")
-			fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.")
+			fmt.Fprintf(os.Stderr, "Auto detection of the VM's IP address failed.\n")
+			fmt.Fprintf(os.Stderr, "Please run `boot2docker -v up` to diagnose.\n")
 		} else {
 			// Check if $DOCKER_HOST ENV var is properly configured.
-			if os.Getenv("DOCKER_HOST") != fmt.Sprintf("tcp://%s:%d", IP, driver.DockerPort) {
-				fmt.Printf("To connect the Docker client to the Docker daemon, please set:")
-				fmt.Printf("    export DOCKER_HOST=tcp://%s:%d", IP, driver.DockerPort)
+			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)
+				// Assume Docker 1.2.0 with TLS on...
+				fmt.Printf("    export DOCKER_CERT_PATH=%s\n", certPath)
 			} else {
-				fmt.Printf("Your DOCKER_HOST env variable is already set correctly.")
+				fmt.Printf("Your DOCKER_HOST env variable is already set correctly.\n")
 			}
 		}
 	}
+	fmt.Printf("\n")
 	return nil
 }
 
 // Tell the user the config (and later let them set it?)
 func cmdConfig() error {
-	dir, err := getCfgDir(".boot2docker")
+	dir, err := cfgDir(".boot2docker")
 	if err != nil {
 		return fmt.Errorf("Error working out Profile file location: %s", err)
 	}
-	filename := getCfgFilename(dir)
+	filename := cfgFilename(dir)
 	fmt.Printf("boot2docker profile filename: %s", filename)
 	fmt.Println(printConfig())
 	return nil
@@ -217,6 +222,26 @@ func cmdStatus() error {
 	return nil
 }
 
+// tell the User the Docker socket to connect to
+func cmdSocket() 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)
+
+	fmt.Fprintf(os.Stderr, "\n\t export DOCKER_HOST=")
+	fmt.Printf("%s", Socket)
+	fmt.Fprintf(os.Stderr, "\n\n")
+
+	return nil
+}
+
 // Call the external SSH command to login into boot2docker VM.
 func cmdSSH() error {
 	m, err := driver.GetMachine(&B2D)
@@ -236,17 +261,7 @@ func cmdSSH() error {
 		i++
 	}
 
-	sshArgs := append([]string{
-		"-o", "IdentitiesOnly=yes",
-		"-o", "StrictHostKeyChecking=no",
-		"-o", "UserKnownHostsFile=/dev/null",
-		"-o", "LogLevel=quiet", // suppress "Warning: Permanently added '[localhost]:2022' (ECDSA) to the list of known hosts."
-		"-p", fmt.Sprintf("%d", m.GetSSHPort()),
-		"-i", B2D.SSHKey,
-		"docker@localhost",
-	}, os.Args[i:]...)
-
-	if err := cmdInteractive(B2D.SSH, sshArgs...); err != nil {
+	if err := cmdInteractive(m, os.Args[i:]...); err != nil {
 		return fmt.Errorf("%s", err)
 	}
 	return nil
@@ -287,38 +302,6 @@ func cmdIP() error {
 	return nil
 }
 
-func RequestIPFromSSH(m driver.Machine) string {
-	// fall back to using the NAT port forwarded ssh
-	out, err := cmd(B2D.SSH,
-		"-v", // please leave in - this seems to improve the chance of success
-		"-o", "IdentitiesOnly=yes",
-		"-o", "StrictHostKeyChecking=no",
-		"-o", "UserKnownHostsFile=/dev/null",
-		"-p", fmt.Sprintf("%d", m.GetSSHPort()),
-		"-i", B2D.SSHKey,
-		"docker@localhost",
-		"ip addr show dev eth1",
-	)
-	IP := ""
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "request ip from ssh error: %v", err)
-	} else {
-		if B2D.Verbose {
-			fmt.Printf("SSH returned: %s\nEND SSH\n", out)
-		}
-		// parse to find: inet 192.168.59.103/24 brd 192.168.59.255 scope global eth1
-		lines := strings.Split(out, "\n")
-		for _, line := range lines {
-			vals := strings.Split(strings.TrimSpace(line), " ")
-			if len(vals) >= 2 && vals[0] == "inet" {
-				IP = vals[1][:strings.Index(vals[1], "/")]
-				break
-			}
-		}
-	}
-	return IP
-}
-
 // Download the boot2docker ISO image.
 func cmdDownload() error {
 	fmt.Printf("Downloading boot2docker ISO image...")

config.go

@@ -20,11 +20,7 @@ var (
 	B2D        = driver.MachineConfig{}
 )
 
-func getCfgDir(name string) (string, error) {
-	if b2dDir := os.Getenv("BOOT2DOCKER_DIR"); b2dDir != "" {
-		return b2dDir, nil
-	}
-
+func homeDir() (string, error) {
 	dir := ""
 
 	// *nix and MSYS Windows
@@ -35,14 +31,29 @@ func getCfgDir(name string) (string, error) {
 	if _, err := os.Stat(dir); err != nil {
 		return "", err
 	}
+
+	return dir, nil
+}
+
+func cfgDir(name string) (string, error) {
+	if name == ".boot2docker" {
+		if b2dDir := os.Getenv("BOOT2DOCKER_DIR"); b2dDir != "" {
+			return b2dDir, nil
+		}
+	}
+
+	dir, err := homeDir()
+	if err != nil {
+		return "", err
+	}
 	dir = filepath.Join(dir, name)
 	if err := os.MkdirAll(dir, 0755); err != nil {
 		return "", err
 	}
 	return dir, nil
 }
 
-func getCfgFilename(dir string) string {
+func cfgFilename(dir string) string {
 	filename := os.Getenv("BOOT2DOCKER_PROFILE")
 	if filename == "" {
 		filename = filepath.Join(dir, "profile")
@@ -64,7 +75,7 @@ func printConfig() string {
 
 // Read configuration from both profile and flags. Flags override profile.
 func config() (*flag.FlagSet, error) {
-	dir, err := getCfgDir(".boot2docker")
+	dir, err := cfgDir(".boot2docker")
 	if err != nil {
 		return nil, fmt.Errorf("failed to get boot2docker directory: %s", err)
 	}
@@ -95,7 +106,7 @@ func config() (*flag.FlagSet, error) {
 	flags.StringVar(&B2D.SSH, "ssh", "ssh", "path to SSH client utility.")
 	flags.StringVar(&B2D.SSHGen, "ssh-keygen", "ssh-keygen", "path to ssh-keygen utility.")
 
-	sshdir, _ := getCfgDir(".ssh")
+	sshdir, _ := cfgDir(".ssh")
 	flags.StringVar(&B2D.SSHKey, "sshkey", filepath.Join(sshdir, "id_boot2docker"), "path to SSH key to use.")
 	flags.UintVarP(&B2D.DiskSize, "disksize", "s", 20000, "boot2docker disk image size (in MB).")
 	flags.UintVarP(&B2D.Memory, "memory", "m", 2048, "virtual machine memory size (in MB).")
@@ -121,7 +132,7 @@ func config() (*flag.FlagSet, error) {
 		return nil, err
 	}
 	// Over-ride from the profile file
-	filename := getCfgFilename(B2D.Dir)
+	filename := cfgFilename(B2D.Dir)
 	if _, err := os.Lstat(filename); err == nil {
 		if _, err := toml.DecodeFile(filename, &B2D); err != nil {
 			return nil, err
@@ -153,7 +164,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|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|delete|destroy|download|version} [<args>]\n", os.Args[0])
 }
 
 func usageLong(flags *flag.FlagSet) {
@@ -175,6 +186,7 @@ Commands:
     config|cfg              Show selected profile file settings.
     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.
     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).

driver/driver.go

@@ -41,6 +41,7 @@ type Machine interface {
 	DelStorageCtl(name string) error
 	AttachStorage(ctlName string, medium StorageMedium) error
 	GetState() MachineState
+	GetName() string
 	GetSerialFile() string
 	GetDockerPort() uint
 	GetSSHPort() uint

dummy/machine.go

@@ -92,6 +92,11 @@ func (m *Machine) Reset() error {
 	return nil
 }
 
+// Get current name
+func (m *Machine) GetName() string {
+	return m.Name
+}
+
 // Get current state
 func (m *Machine) GetState() driver.MachineState {
 	return m.State

main.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"os"
 	"fmt"
+	"os"
 )
 
 // The following vars will be injected during the build process.
@@ -65,6 +65,8 @@ func run() error {
 		return cmdDelete()
 	case "info":
 		return cmdInfo()
+	case "socket":
+		return cmdSocket()
 	case "status":
 		return cmdStatus()
 	case "ssh":