Преглед изворни кода

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 {
 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
 	// Prepend the command name to support normal cobra command delegation
 	c.rootCmd.SetArgs(append([]string{cmd}, args...))
 	c.rootCmd.SetArgs(append([]string{cmd}, args...))
 	return c.rootCmd.Execute()
 	return c.rootCmd.Execute()