瀏覽代碼

Merge pull request #23316 from dnephin/error_on_invalid_docker_host

Fix a panic when the DOCKER_HOST was invalid using cobra commands
Brian Goff 9 年之前
父節點
當前提交
c077d4cc1e
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      cli/cobraadaptor/adaptor.go

+ 3 - 1
cli/cobraadaptor/adaptor.go

@@ -72,7 +72,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()