Skip to content

2.1.1 release #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
febbraro merged 4 commits into from
Feb 2, 2018
Merged

2.1.1 release #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1858c4a
fixing a dashboard bug (#133)
febbraro Jan 18, 2018
0c1508b
Upgraded dnsdock to 1.16.4 to prevent dnsdock from exiting on a faile…
febbraro Jan 29, 2018
a289ec5
Expanded on kill command help description
febbraro Jan 30, 2018
21c9ef1
Kill should use the spinner. (#139)
grayside Feb 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions commands/dashboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand Down
2 changes: 1 addition & 1 deletion commands/dns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions commands/kill.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand All @@ -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
Expand Down