Merge pull request #929 from vdemeester/trust-no-global-var

thaJeztah · web-flow · commit d55bb8eeed06 · 2018-03-09T11:04:09.000+01:00
Refactor content_trust cli/flags handling
diff --git a/man/generate.go b/man/generate.go
@@ -25,7 +25,7 @@ func generateManPages(opts *options) error {
 	}
 
 	stdin, stdout, stderr := term.StdStreams()
-	dockerCli := command.NewDockerCli(stdin, stdout, stderr)
+	dockerCli := command.NewDockerCli(stdin, stdout, stderr, false)
 	cmd := &cobra.Command{Use: "docker"}
 	commands.AddCommands(cmd, dockerCli)
 	source := filepath.Join(opts.source, descriptionSourcePath)

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ func generateManPages(opts *options) error {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`stdin, stdout, stderr := term.StdStreams()`
`28`		`- dockerCli := command.NewDockerCli(stdin, stdout, stderr)`
	`28`	`+ dockerCli := command.NewDockerCli(stdin, stdout, stderr, false)`
`29`	`29`	`cmd := &cobra.Command{Use: "docker"}`
`30`	`30`	`commands.AddCommands(cmd, dockerCli)`
`31`	`31`	`source := filepath.Join(opts.source, descriptionSourcePath)`