new file mode 100644

@@ -0,0 +1,71 @@

+package command

+

+import (

+	"github.com/docker/docker/api/client"

+	"github.com/docker/docker/api/client/container"

+	"github.com/docker/docker/api/client/image"

+	"github.com/docker/docker/api/client/network"

+	"github.com/docker/docker/api/client/node"

+	"github.com/docker/docker/api/client/plugin"

+	"github.com/docker/docker/api/client/registry"

+	"github.com/docker/docker/api/client/service"

+	"github.com/docker/docker/api/client/stack"

+	"github.com/docker/docker/api/client/swarm"

+	"github.com/docker/docker/api/client/system"

+	"github.com/docker/docker/api/client/volume"

+	"github.com/spf13/cobra"

+)

+

+// AddCommands adds all the commands from api/client to the root command

+func AddCommands(cmd *cobra.Command, dockerCli *client.DockerCli) {

+	cmd.AddCommand(

+		node.NewNodeCommand(dockerCli),

+		service.NewServiceCommand(dockerCli),

+		stack.NewStackCommand(dockerCli),

+		stack.NewTopLevelDeployCommand(dockerCli),

+		swarm.NewSwarmCommand(dockerCli),

+		container.NewAttachCommand(dockerCli),

+		container.NewCommitCommand(dockerCli),

+		container.NewCopyCommand(dockerCli),

+		container.NewCreateCommand(dockerCli),

+		container.NewDiffCommand(dockerCli),

+		container.NewExecCommand(dockerCli),

+		container.NewExportCommand(dockerCli),

+		container.NewKillCommand(dockerCli),

+		container.NewLogsCommand(dockerCli),

+		container.NewPauseCommand(dockerCli),

+		container.NewPortCommand(dockerCli),

+		container.NewPsCommand(dockerCli),

+		container.NewRenameCommand(dockerCli),

+		container.NewRestartCommand(dockerCli),

+		container.NewRmCommand(dockerCli),

+		container.NewRunCommand(dockerCli),

+		container.NewStartCommand(dockerCli),

+		container.NewStatsCommand(dockerCli),

+		container.NewStopCommand(dockerCli),

+		container.NewTopCommand(dockerCli),

+		container.NewUnpauseCommand(dockerCli),

+		container.NewUpdateCommand(dockerCli),

+		container.NewWaitCommand(dockerCli),

+		image.NewBuildCommand(dockerCli),

+		image.NewHistoryCommand(dockerCli),

+		image.NewImagesCommand(dockerCli),

+		image.NewLoadCommand(dockerCli),

+		image.NewRemoveCommand(dockerCli),

+		image.NewSaveCommand(dockerCli),

+		image.NewPullCommand(dockerCli),

+		image.NewPushCommand(dockerCli),

+		image.NewSearchCommand(dockerCli),

+		image.NewImportCommand(dockerCli),

+		image.NewTagCommand(dockerCli),

+		network.NewNetworkCommand(dockerCli),

+		system.NewEventsCommand(dockerCli),

+		system.NewInspectCommand(dockerCli),

+		registry.NewLoginCommand(dockerCli),

+		registry.NewLogoutCommand(dockerCli),

+		system.NewVersionCommand(dockerCli),

+		volume.NewVolumeCommand(dockerCli),

+		system.NewInfoCommand(dockerCli),

+	)

+	plugin.NewPluginCommand(cmd, dockerCli)

+}

deleted file mode 100644

@@ -1,6 +0,0 @@

-package client

-

-// Command returns a cli command handler if one exists

-func (cli *DockerCli) Command(name string) func(...string) error {

-	return map[string]func(...string) error{}[name]

-}

@@ -14,7 +14,6 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api/client"

 	"github.com/docker/docker/cli"

-	"github.com/docker/docker/cli/cobraadaptor"

 	opttypes "github.com/docker/docker/opts"

 	"github.com/docker/docker/pkg/promise"

 	"github.com/docker/docker/pkg/signal"

@@ -70,7 +69,7 @@ func NewRunCommand(dockerCli *client.DockerCli) *cobra.Command {

 func flagErrorFunc(cmd *cobra.Command, err error) error {

 	return cli.StatusError{

-		Status:     cobraadaptor.FlagErrorFunc(cmd, err).Error(),

+		Status:     cli.FlagErrorFunc(cmd, err).Error(),

 		StatusCode: 125,

 	}

 }

deleted file mode 100644

@@ -1,191 +0,0 @@

-package cli

-

-import (

-	"errors"

-	"fmt"

-	"io"

-	"os"

-	"strings"

-

-	flag "github.com/docker/docker/pkg/mflag"

-)

-

-// Cli represents a command line interface.

-type Cli struct {

-	Stderr   io.Writer

-	handlers []Handler

-	Usage    func()

-}

-

-// Handler holds the different commands Cli will call

-// It should have methods with names starting with `Cmd` like:

-// 	func (h myHandler) CmdFoo(args ...string) error

-type Handler interface {

-	Command(name string) func(...string) error

-}

-

-// Initializer can be optionally implemented by a Handler to

-// initialize before each call to one of its commands.

-type Initializer interface {

-	Initialize() error

-}

-

-// New instantiates a ready-to-use Cli.

-func New(handlers ...Handler) *Cli {

-	// make the generic Cli object the first cli handler

-	// in order to handle `docker help` appropriately

-	cli := new(Cli)

-	cli.handlers = append([]Handler{cli}, handlers...)

-	return cli

-}

-

-var errCommandNotFound = errors.New("command not found")

-

-func (cli *Cli) command(args ...string) (func(...string) error, error) {

-	for _, c := range cli.handlers {

-		if c == nil {

-			continue

-		}

-		if cmd := c.Command(strings.Join(args, " ")); cmd != nil {

-			if ci, ok := c.(Initializer); ok {

-				if err := ci.Initialize(); err != nil {

-					return nil, err

-				}

-			}

-			return cmd, nil

-		}

-	}

-	return nil, errCommandNotFound

-}

-

-// Run executes the specified command.

-func (cli *Cli) Run(args ...string) error {

-	if len(args) > 1 {

-		command, err := cli.command(args[:2]...)

-		if err == nil {

-			return command(args[2:]...)

-		}

-		if err != errCommandNotFound {

-			return err

-		}

-	}

-	if len(args) > 0 {

-		command, err := cli.command(args[0])

-		if err != nil {

-			if err == errCommandNotFound {

-				cli.noSuchCommand(args[0])

-				return nil

-			}

-			return err

-		}

-		return command(args[1:]...)

-	}

-	return cli.CmdHelp()

-}

-

-func (cli *Cli) noSuchCommand(command string) {

-	if cli.Stderr == nil {

-		cli.Stderr = os.Stderr

-	}

-	fmt.Fprintf(cli.Stderr, "docker: '%s' is not a docker command.\nSee 'docker --help'.\n", command)

-	os.Exit(1)

-}

-

-// Command returns a command handler, or nil if the command does not exist

-func (cli *Cli) Command(name string) func(...string) error {

-	return map[string]func(...string) error{

-		"help": cli.CmdHelp,

-	}[name]

-}

-

-// CmdHelp displays information on a Docker command.

-//

-// If more than one command is specified, information is only shown for the first command.

-//

-// Usage: docker help COMMAND or docker COMMAND --help

-func (cli *Cli) CmdHelp(args ...string) error {

-	if len(args) > 1 {

-		command, err := cli.command(args[:2]...)

-		if err == nil {

-			command("--help")

-			return nil

-		}

-		if err != errCommandNotFound {

-			return err

-		}

-	}

-	if len(args) > 0 {

-		command, err := cli.command(args[0])

-		if err != nil {

-			if err == errCommandNotFound {

-				cli.noSuchCommand(args[0])

-				return nil

-			}

-			return err

-		}

-		command("--help")

-		return nil

-	}

-

-	if cli.Usage == nil {

-		flag.Usage()

-	} else {

-		cli.Usage()

-	}

-

-	return nil

-}

-

-// Subcmd is a subcommand of the main "docker" command.

-// A subcommand represents an action that can be performed

-// from the Docker command line client.

-//

-// To see all available subcommands, run "docker --help".

-func Subcmd(name string, synopses []string, description string, exitOnError bool) *flag.FlagSet {

-	var errorHandling flag.ErrorHandling

-	if exitOnError {

-		errorHandling = flag.ExitOnError

-	} else {

-		errorHandling = flag.ContinueOnError

-	}

-	flags := flag.NewFlagSet(name, errorHandling)

-	flags.Usage = func() {

-		flags.ShortUsage()

-		flags.PrintDefaults()

-	}

-

-	flags.ShortUsage = func() {

-		if len(synopses) == 0 {

-			synopses = []string{""}

-		}

-

-		// Allow for multiple command usage synopses.

-		for i, synopsis := range synopses {

-			lead := "\t"

-			if i == 0 {

-				// First line needs the word 'Usage'.

-				lead = "Usage:\t"

-			}

-

-			if synopsis != "" {

-				synopsis = " " + synopsis

-			}

-

-			fmt.Fprintf(flags.Out(), "\n%sdocker %s%s", lead, name, synopsis)

-		}

-

-		fmt.Fprintf(flags.Out(), "\n\n%s\n", description)

-	}

-

-	return flags

-}

-

-// StatusError reports an unsuccessful exit by a command.

-type StatusError struct {

-	Status     string

-	StatusCode int

-}

-

-func (e StatusError) Error() string {

-	return fmt.Sprintf("Status: %s, Code: %d", e.Status, e.StatusCode)

-}

new file mode 100644

@@ -0,0 +1,54 @@

+package cli

+

+import (

+	"fmt"

+

+	"github.com/spf13/cobra"

+)

+

+// SetupRootCommand sets default usage, help, and error handling for the

+// root command.

+func SetupRootCommand(rootCmd *cobra.Command) {

+	rootCmd.SetUsageTemplate(usageTemplate)

+	rootCmd.SetHelpTemplate(helpTemplate)

+	rootCmd.SetFlagErrorFunc(FlagErrorFunc)

+

+	rootCmd.PersistentFlags().BoolP("help", "h", false, "Print usage")

+	rootCmd.PersistentFlags().MarkShorthandDeprecated("help", "please use --help")

+}

+

+// FlagErrorFunc prints an error messages which matches the format of the

+// docker/docker/cli error messages

+func FlagErrorFunc(cmd *cobra.Command, err error) error {

+	if err == nil {

+		return err

+	}

+

+	usage := ""

+	if cmd.HasSubCommands() {

+		usage = "\n\n" + cmd.UsageString()

+	}

+	return fmt.Errorf("%s\nSee '%s --help'.%s", err, cmd.CommandPath(), usage)

+}

+

+var usageTemplate = `Usage:	{{if not .HasSubCommands}}{{.UseLine}}{{end}}{{if .HasSubCommands}}{{ .CommandPath}} COMMAND{{end}}

+

+{{ .Short | trim }}{{if gt .Aliases 0}}

+

+Aliases:

+  {{.NameAndAliases}}{{end}}{{if .HasExample}}

+

+Examples:

+{{ .Example }}{{end}}{{if .HasFlags}}

+

+Options:

+{{.Flags.FlagUsages | trimRightSpace}}{{end}}{{ if .HasAvailableSubCommands}}

+

+Commands:{{range .Commands}}{{if .IsAvailableCommand}}

+  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{ if .HasSubCommands }}

+

+Run '{{.CommandPath}} COMMAND --help' for more information on a command.{{end}}

+`

+

+var helpTemplate = `

+{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`

deleted file mode 100644

@@ -1,60 +0,0 @@

-package cobraadaptor

-

-import (

-	"fmt"

-

-	"github.com/spf13/cobra"

-)

-

-// SetupRootCommand sets default usage, help, and error handling for the

-// root command.

-func SetupRootCommand(rootCmd *cobra.Command) {

-	rootCmd.SetUsageTemplate(usageTemplate)

-	rootCmd.SetHelpTemplate(helpTemplate)

-	rootCmd.SetFlagErrorFunc(FlagErrorFunc)

-

-	rootCmd.PersistentFlags().BoolP("help", "h", false, "Print usage")

-	rootCmd.PersistentFlags().MarkShorthandDeprecated("help", "please use --help")

-}

-

-// GetRootCommand returns the root command. Required to generate the man pages

-// and reference docs from a script outside this package.

-func (c CobraAdaptor) GetRootCommand() *cobra.Command {

-	return c.rootCmd

-}

-

-// FlagErrorFunc prints an error messages which matches the format of the

-// docker/docker/cli error messages

-func FlagErrorFunc(cmd *cobra.Command, err error) error {

-	if err == nil {

-		return err

-	}

-

-	usage := ""

-	if cmd.HasSubCommands() {

-		usage = "\n\n" + cmd.UsageString()

-	}

-	return fmt.Errorf("%s\nSee '%s --help'.%s", err, cmd.CommandPath(), usage)

-}

-

-var usageTemplate = `Usage:	{{if not .HasSubCommands}}{{.UseLine}}{{end}}{{if .HasSubCommands}}{{ .CommandPath}} COMMAND{{end}}

-

-{{ .Short | trim }}{{if gt .Aliases 0}}

-

-Aliases:

-  {{.NameAndAliases}}{{end}}{{if .HasExample}}

-

-Examples:

-{{ .Example }}{{end}}{{if .HasFlags}}

-

-Options:

-{{.Flags.FlagUsages | trimRightSpace}}{{end}}{{ if .HasAvailableSubCommands}}

-

-Commands:{{range .Commands}}{{if .IsAvailableCommand}}

-  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{ if .HasSubCommands }}

-

-Run '{{.CommandPath}} COMMAND --help' for more information on a command.{{end}}

-`

-

-var helpTemplate = `

-{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`

@@ -1,6 +1,9 @@

 package cli

-import "strings"

+import (

+	"fmt"

+	"strings"

+)

 // Errors is a list of errors.

 // Useful in a loop if you don't want to return the error right away and you want to display after the loop,

@@ -18,3 +21,13 @@ func (errList Errors) Error() string {

 	}

 	return strings.Join(out, ", ")

 }

+

+// StatusError reports an unsuccessful exit by a command.

+type StatusError struct {

+	Status     string

+	StatusCode int

+}

+

+func (e StatusError) Error() string {

+	return fmt.Sprintf("Status: %s, Code: %d", e.Status, e.StatusCode)

+}

deleted file mode 100644

@@ -1,19 +0,0 @@

-package cli

-

-// Command is the struct containing the command name and description

-type Command struct {

-	Name        string

-	Description string

-}

-

-// DockerCommandUsage lists the top level docker commands and their short usage

-var DockerCommandUsage = []Command{}

-

-// DockerCommands stores all the docker command

-var DockerCommands = make(map[string]Command)

-

-func init() {

-	for _, cmd := range DockerCommandUsage {

-		DockerCommands[cmd.Name] = cmd

-	}

-}

@@ -6,19 +6,8 @@ import (

 	"github.com/Sirupsen/logrus"

 	"github.com/docker/docker/api/client"

-	"github.com/docker/docker/api/client/container"

-	"github.com/docker/docker/api/client/image"

-	"github.com/docker/docker/api/client/network"

-	"github.com/docker/docker/api/client/node"

-	"github.com/docker/docker/api/client/plugin"

-	"github.com/docker/docker/api/client/registry"

-	"github.com/docker/docker/api/client/service"

-	"github.com/docker/docker/api/client/stack"

-	"github.com/docker/docker/api/client/swarm"

-	"github.com/docker/docker/api/client/system"

-	"github.com/docker/docker/api/client/volume"

+	"github.com/docker/docker/api/client/command"

 	"github.com/docker/docker/cli"

-	"github.com/docker/docker/cli/cobraadaptor"

 	cliflags "github.com/docker/docker/cli/flags"

 	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/dockerversion"

@@ -50,7 +39,7 @@ func newDockerCommand(dockerCli *client.DockerCli) *cobra.Command {

 			return dockerCli.Initialize(opts)

 		},

 	}

-	cobraadaptor.SetupRootCommand(cmd)

+	cli.SetupRootCommand(cmd)

 	flags := cmd.Flags()

 	flags.BoolVarP(&opts.Version, "version", "v", false, "Print version information and quit")

@@ -58,57 +47,8 @@ func newDockerCommand(dockerCli *client.DockerCli) *cobra.Command {

 	opts.Common.InstallFlags(flags)

 	cmd.SetOutput(dockerCli.Out())

-	cmd.AddCommand(

-		newDaemonCommand(),

-		node.NewNodeCommand(dockerCli),

-		service.NewServiceCommand(dockerCli),

-		stack.NewStackCommand(dockerCli),

-		stack.NewTopLevelDeployCommand(dockerCli),

-		swarm.NewSwarmCommand(dockerCli),

-		container.NewAttachCommand(dockerCli),

-		container.NewCommitCommand(dockerCli),

-		container.NewCopyCommand(dockerCli),

-		container.NewCreateCommand(dockerCli),

-		container.NewDiffCommand(dockerCli),

-		container.NewExecCommand(dockerCli),

-		container.NewExportCommand(dockerCli),

-		container.NewKillCommand(dockerCli),

-		container.NewLogsCommand(dockerCli),

-		container.NewPauseCommand(dockerCli),

-		container.NewPortCommand(dockerCli),

-		container.NewPsCommand(dockerCli),

-		container.NewRenameCommand(dockerCli),

-		container.NewRestartCommand(dockerCli),

-		container.NewRmCommand(dockerCli),

-		container.NewRunCommand(dockerCli),

-		container.NewStartCommand(dockerCli),

-		container.NewStatsCommand(dockerCli),

-		container.NewStopCommand(dockerCli),

-		container.NewTopCommand(dockerCli),

-		container.NewUnpauseCommand(dockerCli),

-		container.NewUpdateCommand(dockerCli),

-		container.NewWaitCommand(dockerCli),

-		image.NewBuildCommand(dockerCli),

-		image.NewHistoryCommand(dockerCli),

-		image.NewImagesCommand(dockerCli),

-		image.NewLoadCommand(dockerCli),

-		image.NewRemoveCommand(dockerCli),

-		image.NewSaveCommand(dockerCli),

-		image.NewPullCommand(dockerCli),

-		image.NewPushCommand(dockerCli),

-		image.NewSearchCommand(dockerCli),

-		image.NewImportCommand(dockerCli),

-		image.NewTagCommand(dockerCli),

-		network.NewNetworkCommand(dockerCli),

-		system.NewEventsCommand(dockerCli),

-		system.NewInspectCommand(dockerCli),

-		registry.NewLoginCommand(dockerCli),

-		registry.NewLogoutCommand(dockerCli),

-		system.NewVersionCommand(dockerCli),

-		volume.NewVolumeCommand(dockerCli),

-		system.NewInfoCommand(dockerCli),

-	)

-	plugin.NewPluginCommand(cmd, dockerCli)

+	cmd.AddCommand(newDaemonCommand())

+	command.AddCommands(cmd, dockerCli)

 	return cmd

 }

deleted file mode 100644

@@ -1,22 +0,0 @@

-package main

-

-import (

-	"sort"

-

-	"github.com/docker/docker/cli"

-)

-

-type byName []cli.Command

-

-func (a byName) Len() int           { return len(a) }

-func (a byName) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }

-func (a byName) Less(i, j int) bool { return a[i].Name < a[j].Name }

-

-// TODO(tiborvass): do not show 'daemon' on client-only binaries

-

-func sortCommands(commands []cli.Command) []cli.Command {

-	dockerCommands := make([]cli.Command, len(commands))

-	copy(dockerCommands, commands)

-	sort.Sort(byName(dockerCommands))

-	return dockerCommands

-}

deleted file mode 100644

@@ -1,15 +0,0 @@

-package main

-

-import (

-	"sort"

-	"testing"

-

-	"github.com/docker/docker/cli"

-)

-

-// Tests if the subcommands of docker are sorted

-func TestDockerSubcommandsAreSorted(t *testing.T) {

-	if !sort.IsSorted(byName(cli.DockerCommandUsage)) {

-		t.Fatal("Docker subcommands are not in sorted order")

-	}

-}

@@ -130,7 +130,7 @@ func TestLoadDaemonConfigWithEmbeddedOptions(t *testing.T) {

 func TestLoadDaemonConfigWithRegistryOptions(t *testing.T) {

 	content := `{

 		"registry-mirrors": ["https://mirrors.docker.com"],

-		"insecure-registries": ["https://insecure.docker.com"],

+		"insecure-registries": ["https://insecure.docker.com"]

 	}`

 	tempFile := tempfile.NewTempFile(t, "config", content)

 	defer tempFile.Remove()

@@ -3,8 +3,6 @@

 package main

 import (

-	"io/ioutil"

-	"os"

 	"testing"

 	"github.com/docker/docker/daemon"

@@ -102,30 +100,13 @@ func TestLoadDaemonConfigWithTrueDefaultValuesLeaveDefaults(t *testing.T) {

 }

 func TestLoadDaemonConfigWithLegacyRegistryOptions(t *testing.T) {

-	c := &daemon.Config{}

-	common := &cliflags.CommonFlags{}

-	flags := mflag.NewFlagSet("test", mflag.ContinueOnError)

-	c.ServiceOptions.InstallCliFlags(flags, absentFromHelp)

-

-	f, err := ioutil.TempFile("", "docker-config-")

-	if err != nil {

-		t.Fatal(err)

-	}

-	configFile := f.Name()

-	defer os.Remove(configFile)

-

-	f.Write([]byte(`{"disable-legacy-registry": true}`))

-	f.Close()

-

-	loadedConfig, err := loadDaemonCliConfig(c, flags, common, configFile)

-	if err != nil {

-		t.Fatal(err)

-	}

-	if loadedConfig == nil {

-		t.Fatal("expected configuration, got nil")

-	}

+	content := `{"disable-legacy-registry": true}`

+	tempFile := tempfile.NewTempFile(t, "config", content)

+	defer tempFile.Remove()

-	if !loadedConfig.V2Only {

-		t.Fatal("expected disable-legacy-registry to be true, got false")

-	}

+	opts := defaultOptions(tempFile.Name())

+	loadedConfig, err := loadDaemonCliConfig(opts)

+	assert.NilError(t, err)

+	assert.NotNil(t, loadedConfig)

+	assert.Equal(t, loadedConfig.V2Only, true)

 }

@@ -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")

@@ -176,7 +176,7 @@ func (config *Config) InstallCommonFlags(flags *pflag.FlagSet) {

 	flags.IntVar(&maxConcurrentDownloads, "max-concurrent-downloads", defaultMaxConcurrentDownloads, "Set the max concurrent downloads for each pull")

 	flags.IntVar(&maxConcurrentUploads, "max-concurrent-uploads", defaultMaxConcurrentUploads, "Set the max concurrent uploads for each push")

-	cmd.StringVar(&config.SwarmDefaultAdvertiseAddr, []string{"-swarm-default-advertise-addr"}, "", usageFn("Set default address or interface for swarm advertised address"))

+	flags.StringVar(&config.SwarmDefaultAdvertiseAddr, "swarm-default-advertise-addr", "", "Set default address or interface for swarm advertised address")

 	config.MaxConcurrentDownloads = &maxConcurrentDownloads

 	config.MaxConcurrentUploads = &maxConcurrentUploads

@@ -4,8 +4,10 @@ import (

 	"fmt"

 	"os"

-	"github.com/docker/docker/cli/cobraadaptor"

-	cliflags "github.com/docker/docker/cli/flags"

+	"github.com/docker/docker/api/client"

+	"github.com/docker/docker/api/client/command"

+	"github.com/docker/docker/pkg/term"

+	"github.com/spf13/cobra"

 	"github.com/spf13/cobra/doc"

 )

@@ -15,10 +17,12 @@ func generateManPages(path string) error {

 		Section: "1",

 		Source:  "Docker Community",

 	}

-	flags := &cliflags.ClientFlags{

-		Common: cliflags.InitCommonFlags(),

-	}

-	cmd := cobraadaptor.NewCobraAdaptor(flags).GetRootCommand()

+

+	stdin, stdout, stderr := term.StdStreams()

+	dockerCli := client.NewDockerCli(stdin, stdout, stderr)

+	cmd := &cobra.Command{Use: "docker"}

+	command.AddCommands(cmd, dockerCli)

+

 	cmd.DisableAutoGenTag = true

 	return doc.GenManTreeFromOpts(cmd, doc.GenManTreeOptions{

 		Header:           header,

deleted file mode 100644

@@ -1,27 +0,0 @@

-Copyright (c) 2014-2016 The Docker & Go Authors. All rights reserved.

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions are

-met:

-

-   * Redistributions of source code must retain the above copyright

-notice, this list of conditions and the following disclaimer.

-   * Redistributions in binary form must reproduce the above

-copyright notice, this list of conditions and the following disclaimer

-in the documentation and/or other materials provided with the

-distribution.

-   * Neither the name of Google Inc. nor the names of its

-contributors may be used to endorse or promote products derived from

-this software without specific prior written permission.

-

-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

deleted file mode 100644

@@ -1,40 +0,0 @@

-Package mflag (aka multiple-flag) implements command-line flag parsing.  

-It's a **hacky** fork of the [official golang package](http://golang.org/pkg/flag/)

-

-It adds:

-

-* both short and long flag version  

-`./example -s red` `./example --string blue`

-

-* multiple names for the same option  

-```

-$>./example -h

-Usage of example:

-  -s, --string="": a simple string

-```

-

-___

-It is very flexible on purpose, so you can do things like:  

-```

-$>./example -h

-Usage of example:

-  -s, -string, --string="": a simple string

-```

-

-Or:  

-```

-$>./example -h

-Usage of example:

-  -oldflag, --newflag="": a simple string

-```

-

-You can also hide some flags from the usage, so if we want only `--newflag`:  

-```

-$>./example -h

-Usage of example:

-  --newflag="": a simple string

-$>./example -oldflag str

-str

-```

-

-See [example.go](example/example.go) for more details.

deleted file mode 100644

@@ -1,37 +0,0 @@

-package main

-

-import (

-	"fmt"

-

-	flag "github.com/docker/docker/pkg/mflag"

-)

-

-var (

-	i        int

-	str      string

-	b, b2, h bool

-)

-

-func init() {

-	flag.Bool([]string{"#hp", "#-halp"}, false, "display the halp")

-	flag.BoolVar(&b, []string{"b", "#bal", "#bol", "-bal"}, false, "a simple bool")

-	flag.BoolVar(&b, []string{"g", "#gil"}, false, "a simple bool")

-	flag.BoolVar(&b2, []string{"#-bool"}, false, "a simple bool")

-	flag.IntVar(&i, []string{"-integer", "-number"}, -1, "a simple integer")

-	flag.StringVar(&str, []string{"s", "#hidden", "-string"}, "", "a simple string") //-s -hidden and --string will work, but -hidden won't be in the usage

-	flag.BoolVar(&h, []string{"h", "#help", "-help"}, false, "display the help")

-	flag.StringVar(&str, []string{"mode"}, "mode1", "set the mode\nmode1: use the mode1\nmode2: use the mode2\nmode3: use the mode3")

-	flag.Parse()

-}

-func main() {

-	if h {

-		flag.PrintDefaults()

-	} else {

-		fmt.Printf("s/#hidden/-string: %s\n", str)

-		fmt.Printf("b: %t\n", b)

-		fmt.Printf("-bool: %t\n", b2)

-		fmt.Printf("-integer/-number: %d\n", i)

-		fmt.Printf("s/#hidden/-string(via lookup): %s\n", flag.Lookup("s").Value.String())

-		fmt.Printf("ARGS: %v\n", flag.Args())

-	}

-}

deleted file mode 100644

@@ -1,1280 +0,0 @@

-// Copyright 2014-2016 The Docker & Go Authors. All rights reserved.

-// Use of this source code is governed by a BSD-style

-// license that can be found in the LICENSE file.

-

-//	Package mflag implements command-line flag parsing.

-//

-//	Usage:

-//

-//	Define flags using flag.String(), Bool(), Int(), etc.

-//

-//	This declares an integer flag, -f or --flagname, stored in the pointer ip, with type *int.

-//		import flag "github.com/docker/docker/pkg/mflag"

-//		var ip = flag.Int([]string{"f", "-flagname"}, 1234, "help message for flagname")

-//	If you like, you can bind the flag to a variable using the Var() functions.

-//		var flagvar int

-//		func init() {

-//			// -flaghidden will work, but will be hidden from the usage

-//			flag.IntVar(&flagvar, []string{"f", "#flaghidden", "-flagname"}, 1234, "help message for flagname")

-//		}

-//	Or you can create custom flags that satisfy the Value interface (with

-//	pointer receivers) and couple them to flag parsing by

-//		flag.Var(&flagVal, []string{"name"}, "help message for flagname")

-//	For such flags, the default value is just the initial value of the variable.

-//

-//	You can also add "deprecated" flags, they are still usable, but are not shown

-//	in the usage and will display a warning when you try to use them. `#` before

-//	an option means this option is deprecated, if there is a following option

-//	without `#` ahead, then that's the replacement, if not, it will just be removed:

-//		var ip = flag.Int([]string{"#f", "#flagname", "-flagname"}, 1234, "help message for flagname")

-//	this will display: `Warning: '-f' is deprecated, it will be replaced by '--flagname' soon. See usage.` or

-//	this will display: `Warning: '-flagname' is deprecated, it will be replaced by '--flagname' soon. See usage.`

-//		var ip = flag.Int([]string{"f", "#flagname"}, 1234, "help message for flagname")

-//	will display: `Warning: '-flagname' is deprecated, it will be removed soon. See usage.`

-//	so you can only use `-f`.

-//

-//	You can also group one letter flags, if you declare

-//		var v = flag.Bool([]string{"v", "-verbose"}, false, "help message for verbose")

-//		var s = flag.Bool([]string{"s", "-slow"}, false, "help message for slow")

-//	you will be able to use the -vs or -sv

-//

-//	After all flags are defined, call

-//		flag.Parse()

-//	to parse the command line into the defined flags.

-//