From 9d8e92060115face4202a6ce6f63378b17b0d1e9 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Mon, 6 Jun 2016 14:17:04 -0400 Subject: [PATCH] Fix a panic when the DOCKER_HOST was invalid using cobra commands. Signed-off-by: Daniel Nephin Upstream-commit: 90244abc5bfc3be3f97bef16f15079c4fb96c1ff Component: engine --- components/engine/cli/cobraadaptor/adaptor.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/engine/cli/cobraadaptor/adaptor.go b/components/engine/cli/cobraadaptor/adaptor.go index ca7d4e54c0..342c1f8781 100644 --- a/components/engine/cli/cobraadaptor/adaptor.go +++ b/components/engine/cli/cobraadaptor/adaptor.go @@ -71,7 +71,9 @@ func (c CobraAdaptor) Usage() []cli.Command { } func (c CobraAdaptor) run(cmd string, args []string) error { - c.dockerCli.Initialize() + if err := c.dockerCli.Initialize(); err != nil { + return err + } // Prepend the command name to support normal cobra command delegation c.rootCmd.SetArgs(append([]string{cmd}, args...)) return c.rootCmd.Execute()