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>
Upstream-commit: 14712f9ff0d20a3b64a60103608b8cc998909242
Component: engine
This commit is contained in:
Daniel Nephin
2016-06-23 11:25:51 -04:00
parent 9d7fdddb73
commit e263ef28d9
22 changed files with 116 additions and 2279 deletions

View File

@ -5,7 +5,6 @@ import (
"github.com/Sirupsen/logrus"
"github.com/docker/docker/cli"
"github.com/docker/docker/cli/cobraadaptor"
cliflags "github.com/docker/docker/cli/flags"
"github.com/docker/docker/daemon"
"github.com/docker/docker/dockerversion"
@ -41,7 +40,7 @@ func newDaemonCommand() *cobra.Command {
return runDaemon(opts)
},
}
cobraadaptor.SetupRootCommand(cmd)
cli.SetupRootCommand(cmd)
flags := cmd.Flags()
flags.BoolVarP(&opts.version, "version", "v", false, "Print version information and quit")