Merge pull request #142 from phase2/develop

2.1.1 release

Author: febbraro

Gopkg.lock

@@ -33,8 +33,7 @@ func (cmd *Dashboard) Commands() []cli.Command {
 func (cmd *Dashboard) Run(ctx *cli.Context) error {
 	if cmd.machine.IsRunning() || util.SupportsNativeDocker() {
 		cmd.out.Info("Launching Dashboard")
-		err := cmd.LaunchDashboard(cmd.machine)
-		if err != nil {
+		if err := cmd.LaunchDashboard(cmd.machine); err == nil {
 			// Success may be presumed to only execute once per command execution.
 			// This allows calling LaunchDashboard() from start.go without success.
 			return cmd.Success("")

commands/dashboard.go

@@ -145,7 +145,7 @@ func (cmd *DNS) StartDNS(machine Machine, nameservers string) error {
 		"-l", "com.dnsdock.image=outrigger",
 		"--name", "dnsdock",
 		"-p", fmt.Sprintf("%s:53:53/udp", bridgeIP),
-		"aacebedo/dnsdock:v1.16.1-amd64",
+		"aacebedo/dnsdock:v1.16.4-amd64",
 		"--domain=vm",
 	}
 	for _, server := range dnsServers {

commands/dns.go

@@ -17,7 +17,7 @@ func (cmd *Kill) Commands() []cli.Command {
 	return []cli.Command{
 		{
 			Name:   "kill",
-			Usage:  "Kill the docker-machine",
+			Usage:  "Kill the docker-machine. Useful when stop does not appear to be working",
 			Before: cmd.Before,
 			Action: cmd.Run,
 		},
@@ -40,7 +40,7 @@ func (cmd *Kill) Run(c *cli.Context) error {
 		return err
 	}
 
-	cmd.out.Info("Killing machine '%s'", cmd.machine.Name)
+	cmd.out.Spin(fmt.Sprintf("Killing machine '%s'...", cmd.machine.Name))
 	util.StreamCommand("docker-machine", "kill", cmd.machine.Name)
 
 	// Ensure the underlying virtualization has stopped