From 1858c4aa453a3194adc314dbfde81179e655e545 Mon Sep 17 00:00:00 2001 From: Frank Febbraro Date: Thu, 18 Jan 2018 13:08:19 -0800 Subject: [PATCH 1/4] fixing a dashboard bug (#133) --- Gopkg.lock | 3 +-- commands/dashboard.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 77816f8..7045d6c 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -88,7 +88,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "86055c933d04a9f46045c437c0e163af6622e85cf0ea6625c54c4222b52e62ab" + inputs-digest = "37871abf94f116d8e8a59b2237a112eaaa983208b2c3131fe761abd7df238104" solver-name = "gps-cdcl" solver-version = 1 - diff --git a/commands/dashboard.go b/commands/dashboard.go index 3c3b9d5..c471a96 100644 --- a/commands/dashboard.go +++ b/commands/dashboard.go @@ -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("") From 0c1508b9c6114a7ec389739c488b3dfc7f18100a Mon Sep 17 00:00:00 2001 From: Frank Febbraro Date: Mon, 29 Jan 2018 13:15:56 -0800 Subject: [PATCH 2/4] Upgraded dnsdock to 1.16.4 to prevent dnsdock from exiting on a failed fallback lookup (#137) --- commands/dns.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/dns.go b/commands/dns.go index 04281b2..6770b5f 100644 --- a/commands/dns.go +++ b/commands/dns.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 { From a289ec5b6079622444f1e337f9fa2f844f84981d Mon Sep 17 00:00:00 2001 From: Frank Febbraro Date: Tue, 30 Jan 2018 13:28:51 -0800 Subject: [PATCH 3/4] Expanded on kill command help description --- commands/kill.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/kill.go b/commands/kill.go index 9949fb9..1c1aa82 100644 --- a/commands/kill.go +++ b/commands/kill.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, }, From 21c9ef1944da1f14c357d8c5cbf8c72ee13c82ff Mon Sep 17 00:00:00 2001 From: Adam Ross Date: Thu, 1 Feb 2018 12:32:36 -0800 Subject: [PATCH 4/4] Kill should use the spinner. (#139) --- commands/kill.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/kill.go b/commands/kill.go index 1c1aa82..1bcd2d6 100644 --- a/commands/kill.go +++ b/commands/kill.go @@ -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