@@ -9,7 +9,7 @@ import (

 	"runtime"

 	"github.com/docker/docker/api"

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

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

 	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/cliconfig/credentials"

 	"github.com/docker/docker/dockerversion"

@@ -112,7 +112,7 @@ func (cli *DockerCli) restoreTerminal(in io.Closer) error {

 // The key file, protocol (i.e. unix) and address are passed in as strings, along with the tls.Config. If the tls.Config

 // is set the client scheme will be set to https.

 // The client will be given a 32-second timeout (see https://github.com/docker/docker/pull/8035).

-func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cli.ClientFlags) *DockerCli {

+func NewDockerCli(in io.ReadCloser, out, err io.Writer, clientFlags *cliflags.ClientFlags) *DockerCli {

 	cli := &DockerCli{

 		in:      in,

 		out:     out,

deleted file mode 100644

@@ -1,12 +0,0 @@

-package cli

-

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

-

-// ClientFlags represents flags for the docker client.

-type ClientFlags struct {

-	FlagSet   *flag.FlagSet

-	Common    *CommonFlags

-	PostParse func()

-

-	ConfigDir string

-}

deleted file mode 100644

@@ -1,80 +0,0 @@

-package cli

-

-import (

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

-	"github.com/docker/go-connections/tlsconfig"

-)

-

-// CommonFlags represents flags that are common to both the client and the daemon.

-type CommonFlags struct {

-	FlagSet   *flag.FlagSet

-	PostParse func()

-

-	Debug      bool

-	Hosts      []string

-	LogLevel   string

-	TLS        bool

-	TLSVerify  bool

-	TLSOptions *tlsconfig.Options

-	TrustKey   string

-}

-

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

-type Command struct {

-	Name        string

-	Description string

-}

-

-var dockerCommands = []Command{

-	{"attach", "Attach to a running container"},

-	{"build", "Build an image from a Dockerfile"},

-	{"commit", "Create a new image from a container's changes"},

-	{"cp", "Copy files/folders between a container and the local filesystem"},

-	{"create", "Create a new container"},

-	{"diff", "Inspect changes on a container's filesystem"},

-	{"events", "Get real time events from the server"},

-	{"exec", "Run a command in a running container"},

-	{"export", "Export a container's filesystem as a tar archive"},

-	{"history", "Show the history of an image"},

-	{"images", "List images"},

-	{"import", "Import the contents from a tarball to create a filesystem image"},

-	{"info", "Display system-wide information"},

-	{"inspect", "Return low-level information on a container or image"},

-	{"kill", "Kill a running container"},

-	{"load", "Load an image from a tar archive or STDIN"},

-	{"login", "Log in to a Docker registry"},

-	{"logout", "Log out from a Docker registry"},

-	{"logs", "Fetch the logs of a container"},

-	{"network", "Manage Docker networks"},

-	{"pause", "Pause all processes within a container"},

-	{"port", "List port mappings or a specific mapping for the CONTAINER"},

-	{"ps", "List containers"},

-	{"pull", "Pull an image or a repository from a registry"},

-	{"push", "Push an image or a repository to a registry"},

-	{"rename", "Rename a container"},

-	{"restart", "Restart a container"},

-	{"rm", "Remove one or more containers"},

-	{"rmi", "Remove one or more images"},

-	{"run", "Run a command in a new container"},

-	{"save", "Save one or more images to a tar archive"},

-	{"search", "Search the Docker Hub for images"},

-	{"start", "Start one or more stopped containers"},

-	{"stats", "Display a live stream of container(s) resource usage statistics"},

-	{"stop", "Stop a running container"},

-	{"tag", "Tag an image into a repository"},

-	{"top", "Display the running processes of a container"},

-	{"unpause", "Unpause all processes within a container"},

-	{"update", "Update configuration of one or more containers"},

-	{"version", "Show the Docker version information"},

-	{"volume", "Manage Docker volumes"},

-	{"wait", "Block until a container stops, then print its exit code"},

-}

-

-// DockerCommands stores all the docker command

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

-

-func init() {

-	for _, cmd := range dockerCommands {

-		DockerCommands[cmd.Name] = cmd

-	}

-}

new file mode 100644

@@ -0,0 +1,12 @@

+package flags

+

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

+

+// ClientFlags represents flags for the docker client.

+type ClientFlags struct {

+	FlagSet   *flag.FlagSet

+	Common    *CommonFlags

+	PostParse func()

+

+	ConfigDir string

+}

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

 	"path/filepath"

 	"github.com/Sirupsen/logrus"

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

 	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/opts"

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

@@ -31,9 +30,23 @@ var (

 	dockerTLSVerify = os.Getenv("DOCKER_TLS_VERIFY") != ""

 )

+// CommonFlags are flags common to both the client and the daemon.

+type CommonFlags struct {

+	FlagSet   *flag.FlagSet

+	PostParse func()

+

+	Debug      bool

+	Hosts      []string

+	LogLevel   string

+	TLS        bool

+	TLSVerify  bool

+	TLSOptions *tlsconfig.Options

+	TrustKey   string

+}

+

 // InitCommonFlags initializes flags common to both client and daemon

-func InitCommonFlags() *cli.CommonFlags {

-	var commonFlags = &cli.CommonFlags{FlagSet: new(flag.FlagSet)}

+func InitCommonFlags() *CommonFlags {

+	var commonFlags = &CommonFlags{FlagSet: new(flag.FlagSet)}

 	if dockerCertPath == "" {

 		dockerCertPath = cliconfig.ConfigDir()

@@ -60,7 +73,7 @@ func InitCommonFlags() *cli.CommonFlags {

 	return commonFlags

 }

-func postParseCommon(commonFlags *cli.CommonFlags) {

+func postParseCommon(commonFlags *CommonFlags) {

 	cmd := commonFlags.FlagSet

 	SetDaemonLogLevel(commonFlags.LogLevel)

new file mode 100644

@@ -0,0 +1,61 @@

+package cli

+

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

+type Command struct {

+	Name        string

+	Description string

+}

+

+var dockerCommands = []Command{

+	{"attach", "Attach to a running container"},

+	{"build", "Build an image from a Dockerfile"},

+	{"commit", "Create a new image from a container's changes"},

+	{"cp", "Copy files/folders between a container and the local filesystem"},

+	{"create", "Create a new container"},

+	{"diff", "Inspect changes on a container's filesystem"},

+	{"events", "Get real time events from the server"},

+	{"exec", "Run a command in a running container"},

+	{"export", "Export a container's filesystem as a tar archive"},

+	{"history", "Show the history of an image"},

+	{"images", "List images"},

+	{"import", "Import the contents from a tarball to create a filesystem image"},

+	{"info", "Display system-wide information"},

+	{"inspect", "Return low-level information on a container or image"},

+	{"kill", "Kill a running container"},

+	{"load", "Load an image from a tar archive or STDIN"},

+	{"login", "Log in to a Docker registry"},

+	{"logout", "Log out from a Docker registry"},

+	{"logs", "Fetch the logs of a container"},

+	{"network", "Manage Docker networks"},

+	{"pause", "Pause all processes within a container"},

+	{"port", "List port mappings or a specific mapping for the CONTAINER"},

+	{"ps", "List containers"},

+	{"pull", "Pull an image or a repository from a registry"},

+	{"push", "Push an image or a repository to a registry"},

+	{"rename", "Rename a container"},

+	{"restart", "Restart a container"},

+	{"rm", "Remove one or more containers"},

+	{"rmi", "Remove one or more images"},

+	{"run", "Run a command in a new container"},

+	{"save", "Save one or more images to a tar archive"},

+	{"search", "Search the Docker Hub for images"},

+	{"start", "Start one or more stopped containers"},

+	{"stats", "Display a live stream of container(s) resource usage statistics"},

+	{"stop", "Stop a running container"},

+	{"tag", "Tag an image into a repository"},

+	{"top", "Display the running processes of a container"},

+	{"unpause", "Unpause all processes within a container"},

+	{"update", "Update configuration of one or more containers"},

+	{"version", "Show the Docker version information"},

+	{"volume", "Manage Docker volumes"},

+	{"wait", "Block until a container stops, then print its exit code"},

+}

+

+// DockerCommands stores all the docker command

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

+

+func init() {

+	for _, cmd := range dockerCommands {

+		DockerCommands[cmd.Name] = cmd

+	}

+}

@@ -3,7 +3,6 @@ package main

 import (

 	"path/filepath"

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

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

 	"github.com/docker/docker/cliconfig"

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

@@ -12,7 +11,7 @@ import (

 var (

 	commonFlags = cliflags.InitCommonFlags()

-	clientFlags = &cli.ClientFlags{FlagSet: new(flag.FlagSet), Common: commonFlags}

+	clientFlags = &cliflags.ClientFlags{FlagSet: new(flag.FlagSet), Common: commonFlags}

 )

 func init() {

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

 	systemrouter "github.com/docker/docker/api/server/router/system"

 	"github.com/docker/docker/api/server/router/volume"

 	"github.com/docker/docker/builder/dockerfile"

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

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

 	"github.com/docker/docker/cliconfig"

 	"github.com/docker/docker/daemon"

@@ -51,7 +50,7 @@ const (

 // DaemonCli represents the daemon CLI.

 type DaemonCli struct {

 	*daemon.Config

-	commonFlags *cli.CommonFlags

+	commonFlags *cliflags.CommonFlags

 	configFile  *string

 }

@@ -345,7 +344,7 @@ func shutdownDaemon(d *daemon.Daemon, timeout time.Duration) {

 	}

 }

-func loadDaemonCliConfig(config *daemon.Config, flags *flag.FlagSet, commonConfig *cli.CommonFlags, configFile string) (*daemon.Config, error) {

+func loadDaemonCliConfig(config *daemon.Config, flags *flag.FlagSet, commonConfig *cliflags.CommonFlags, configFile string) (*daemon.Config, error) {

 	config.Debug = commonConfig.Debug

 	config.Hosts = commonConfig.Hosts

 	config.LogLevel = commonConfig.LogLevel

@@ -7,7 +7,7 @@ import (

 	"testing"

 	"github.com/Sirupsen/logrus"

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

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

 	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/opts"

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

@@ -16,7 +16,7 @@ import (

 func TestLoadDaemonCliConfigWithoutOverriding(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{

+	common := &cliflags.CommonFlags{

 		Debug: true,

 	}

@@ -35,7 +35,7 @@ func TestLoadDaemonCliConfigWithoutOverriding(t *testing.T) {

 func TestLoadDaemonCliConfigWithTLS(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{

+	common := &cliflags.CommonFlags{

 		TLS: true,

 		TLSOptions: &tlsconfig.Options{

 			CAFile: "/tmp/ca.pem",

@@ -57,7 +57,7 @@ func TestLoadDaemonCliConfigWithTLS(t *testing.T) {

 func TestLoadDaemonCliConfigWithConflicts(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{}

+	common := &cliflags.CommonFlags{}

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

 	if err != nil {

 		t.Fatal(err)

@@ -93,7 +93,7 @@ func TestLoadDaemonCliConfigWithConflicts(t *testing.T) {

 func TestLoadDaemonCliConfigWithTLSVerify(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{

+	common := &cliflags.CommonFlags{

 		TLSOptions: &tlsconfig.Options{

 			CAFile: "/tmp/ca.pem",

 		},

@@ -126,7 +126,7 @@ func TestLoadDaemonCliConfigWithTLSVerify(t *testing.T) {

 func TestLoadDaemonCliConfigWithExplicitTLSVerifyFalse(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{

+	common := &cliflags.CommonFlags{

 		TLSOptions: &tlsconfig.Options{

 			CAFile: "/tmp/ca.pem",

 		},

@@ -159,7 +159,7 @@ func TestLoadDaemonCliConfigWithExplicitTLSVerifyFalse(t *testing.T) {

 func TestLoadDaemonCliConfigWithoutTLSVerify(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{

+	common := &cliflags.CommonFlags{

 		TLSOptions: &tlsconfig.Options{

 			CAFile: "/tmp/ca.pem",

 		},

@@ -191,7 +191,7 @@ func TestLoadDaemonCliConfigWithoutTLSVerify(t *testing.T) {

 func TestLoadDaemonCliConfigWithLogLevel(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{}

+	common := &cliflags.CommonFlags{}

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

 	if err != nil {

@@ -223,7 +223,7 @@ func TestLoadDaemonCliConfigWithLogLevel(t *testing.T) {

 func TestLoadDaemonConfigWithEmbeddedOptions(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{}

+	common := &cliflags.CommonFlags{}

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

 	flags.String([]string{"-tlscacert"}, "", "")

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

 func TestLoadDaemonConfigWithRegistryOptions(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{}

+	common := &cliflags.CommonFlags{}

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

 	c.ServiceOptions.InstallCliFlags(flags, absentFromHelp)

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

 	"io/ioutil"

 	"testing"

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

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

 	"github.com/docker/docker/daemon"

 	"github.com/docker/docker/opts"

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

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

 func TestLoadDaemonCliConfigWithDaemonFlags(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{

+	common := &cliflags.CommonFlags{

 		Debug:    true,

 		LogLevel: "info",

 	}

@@ -61,7 +61,7 @@ func TestLoadDaemonCliConfigWithDaemonFlags(t *testing.T) {

 func TestLoadDaemonConfigWithNetwork(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{}

+	common := &cliflags.CommonFlags{}

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

 	flags.String([]string{"-bip"}, "", "")

 	flags.String([]string{"-ip"}, "", "")

@@ -92,7 +92,7 @@ func TestLoadDaemonConfigWithNetwork(t *testing.T) {

 func TestLoadDaemonConfigWithMapOptions(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{}

+	common := &cliflags.CommonFlags{}

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

 	flags.Var(opts.NewNamedMapOpts("cluster-store-opts", c.ClusterOpts, nil), []string{"-cluster-store-opt"}, "")

@@ -136,7 +136,7 @@ func TestLoadDaemonConfigWithMapOptions(t *testing.T) {

 func TestLoadDaemonConfigWithTrueDefaultValues(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{}

+	common := &cliflags.CommonFlags{}

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

 	flags.BoolVar(&c.EnableUserlandProxy, []string{"-userland-proxy"}, true, "")

@@ -181,7 +181,7 @@ func TestLoadDaemonConfigWithTrueDefaultValues(t *testing.T) {

 func TestLoadDaemonConfigWithTrueDefaultValuesLeaveDefaults(t *testing.T) {

 	c := &daemon.Config{}

-	common := &cli.CommonFlags{}

+	common := &cliflags.CommonFlags{}

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

 	flags.BoolVar(&c.EnableUserlandProxy, []string{"-userland-proxy"}, true, "")