Skip to content

Commit 357f26d

Browse files
dnephinTibor Vass
authored andcommitted
Remove old cli framework.
Also consolidate the leftover packages under cli. Remove pkg/mflag. Make manpage generation work with new cobra layout. Remove remaining mflag and fix tests after rebase with master. Signed-off-by: Daniel Nephin <dnephin@docker.com>
1 parent 891740e commit 357f26d

1 file changed

Lines changed: 10 additions & 6 deletions

File tree

man/generate.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/docker/docker/cli/cobraadaptor"
8-
cliflags "github.com/docker/docker/cli/flags"
7+
"github.com/docker/docker/api/client"
8+
"github.com/docker/docker/api/client/command"
9+
"github.com/docker/docker/pkg/term"
10+
"github.com/spf13/cobra"
911
"github.com/spf13/cobra/doc"
1012
)
1113

@@ -15,10 +17,12 @@ func generateManPages(path string) error {
1517
Section: "1",
1618
Source: "Docker Community",
1719
}
18-
flags := &cliflags.ClientFlags{
19-
Common: cliflags.InitCommonFlags(),
20-
}
21-
cmd := cobraadaptor.NewCobraAdaptor(flags).GetRootCommand()
20+
21+
stdin, stdout, stderr := term.StdStreams()
22+
dockerCli := client.NewDockerCli(stdin, stdout, stderr)
23+
cmd := &cobra.Command{Use: "docker"}
24+
command.AddCommands(cmd, dockerCli)
25+
2226
cmd.DisableAutoGenTag = true
2327
return doc.GenManTreeFromOpts(cmd, doc.GenManTreeOptions{
2428
Header: header,

0 commit comments

Comments
 (0)