@@ -19,6 +19,5 @@ func (cli *DockerCli) Command(name string) func(...string) error {

 		"save":    cli.CmdSave,

 		"stats":   cli.CmdStats,

 		"update":  cli.CmdUpdate,

-		"version": cli.CmdVersion,

 	}[name]

 }

new file mode 100644

@@ -0,0 +1,110 @@

+package system

+

+import (

+	"runtime"

+	"time"

+

+	"golang.org/x/net/context"

+

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

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

+	"github.com/docker/docker/dockerversion"

+	"github.com/docker/docker/utils"

+	"github.com/docker/docker/utils/templates"

+	"github.com/docker/engine-api/types"

+	"github.com/spf13/cobra"

+)

+

+var versionTemplate = `Client:

+ Version:      {{.Client.Version}}

+ API version:  {{.Client.APIVersion}}

+ Go version:   {{.Client.GoVersion}}

+ Git commit:   {{.Client.GitCommit}}

+ Built:        {{.Client.BuildTime}}

+ OS/Arch:      {{.Client.Os}}/{{.Client.Arch}}{{if .Client.Experimental}}

+ Experimental: {{.Client.Experimental}}{{end}}{{if .ServerOK}}

+

+Server:

+ Version:      {{.Server.Version}}

+ API version:  {{.Server.APIVersion}}

+ Go version:   {{.Server.GoVersion}}

+ Git commit:   {{.Server.GitCommit}}

+ Built:        {{.Server.BuildTime}}

+ OS/Arch:      {{.Server.Os}}/{{.Server.Arch}}{{if .Server.Experimental}}

+ Experimental: {{.Server.Experimental}}{{end}}{{end}}`

+

+type versionOptions struct {

+	format string

+}

+

+// NewVersionCommand creats a new cobra.Command for `docker version`

+func NewVersionCommand(dockerCli *client.DockerCli) *cobra.Command {

+	var opts versionOptions

+

+	cmd := &cobra.Command{

+		Use:   "version [OPTIONS]",

+		Short: "Show the Docker version information",

+		Args:  cli.ExactArgs(0),

+		RunE: func(cmd *cobra.Command, args []string) error {

+			return runVersion(dockerCli, &opts)

+		},

+	}

+

+	flags := cmd.Flags()

+

+	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")

+

+	return cmd

+}

+

+func runVersion(dockerCli *client.DockerCli, opts *versionOptions) error {

+	ctx := context.Background()

+

+	templateFormat := versionTemplate

+	if opts.format != "" {

+		templateFormat = opts.format

+	}

+

+	tmpl, err := templates.Parse(templateFormat)

+	if err != nil {

+		return cli.StatusError{StatusCode: 64,

+			Status: "Template parsing error: " + err.Error()}

+	}

+

+	vd := types.VersionResponse{

+		Client: &types.Version{

+			Version:      dockerversion.Version,

+			APIVersion:   dockerCli.Client().ClientVersion(),

+			GoVersion:    runtime.Version(),

+			GitCommit:    dockerversion.GitCommit,

+			BuildTime:    dockerversion.BuildTime,

+			Os:           runtime.GOOS,

+			Arch:         runtime.GOARCH,

+			Experimental: utils.ExperimentalBuild(),

+		},

+	}

+

+	serverVersion, err := dockerCli.Client().ServerVersion(ctx)

+	if err == nil {

+		vd.Server = &serverVersion

+	}

+

+	// first we need to make BuildTime more human friendly

+	t, errTime := time.Parse(time.RFC3339Nano, vd.Client.BuildTime)

+	if errTime == nil {

+		vd.Client.BuildTime = t.Format(time.ANSIC)

+	}

+

+	if vd.ServerOK() {

+		t, errTime = time.Parse(time.RFC3339Nano, vd.Server.BuildTime)

+		if errTime == nil {

+			vd.Server.BuildTime = t.Format(time.ANSIC)

+		}

+	}

+

+	if err2 := tmpl.Execute(dockerCli.Out(), vd); err2 != nil && err == nil {

+		err = err2

+	}

+	dockerCli.Out().Write([]byte{'\n'})

+	return err

+}

deleted file mode 100644

@@ -1,95 +0,0 @@

-package client

-

-import (

-	"runtime"

-	"text/template"

-	"time"

-

-	"golang.org/x/net/context"

-

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

-	"github.com/docker/docker/dockerversion"

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

-	"github.com/docker/docker/utils"

-	"github.com/docker/docker/utils/templates"

-	"github.com/docker/engine-api/types"

-)

-

-var versionTemplate = `Client:

- Version:      {{.Client.Version}}

- API version:  {{.Client.APIVersion}}

- Go version:   {{.Client.GoVersion}}

- Git commit:   {{.Client.GitCommit}}

- Built:        {{.Client.BuildTime}}

- OS/Arch:      {{.Client.Os}}/{{.Client.Arch}}{{if .Client.Experimental}}

- Experimental: {{.Client.Experimental}}{{end}}{{if .ServerOK}}

-

-Server:

- Version:      {{.Server.Version}}

- API version:  {{.Server.APIVersion}}

- Go version:   {{.Server.GoVersion}}

- Git commit:   {{.Server.GitCommit}}

- Built:        {{.Server.BuildTime}}

- OS/Arch:      {{.Server.Os}}/{{.Server.Arch}}{{if .Server.Experimental}}

- Experimental: {{.Server.Experimental}}{{end}}{{end}}`

-

-// CmdVersion shows Docker version information.

-//

-// Available version information is shown for: client Docker version, client API version, client Go version, client Git commit, client OS/Arch, server Docker version, server API version, server Go version, server Git commit, and server OS/Arch.

-//

-// Usage: docker version

-func (cli *DockerCli) CmdVersion(args ...string) (err error) {

-	cmd := Cli.Subcmd("version", nil, Cli.DockerCommands["version"].Description, true)

-	tmplStr := cmd.String([]string{"f", "#format", "-format"}, "", "Format the output using the given go template")

-	cmd.Require(flag.Exact, 0)

-

-	cmd.ParseFlags(args, true)

-

-	templateFormat := versionTemplate

-	if *tmplStr != "" {

-		templateFormat = *tmplStr

-	}

-

-	var tmpl *template.Template

-	if tmpl, err = templates.Parse(templateFormat); err != nil {

-		return Cli.StatusError{StatusCode: 64,

-			Status: "Template parsing error: " + err.Error()}

-	}

-

-	vd := types.VersionResponse{

-		Client: &types.Version{

-			Version:      dockerversion.Version,

-			APIVersion:   cli.client.ClientVersion(),

-			GoVersion:    runtime.Version(),

-			GitCommit:    dockerversion.GitCommit,

-			BuildTime:    dockerversion.BuildTime,

-			Os:           runtime.GOOS,

-			Arch:         runtime.GOARCH,

-			Experimental: utils.ExperimentalBuild(),

-		},

-	}

-

-	serverVersion, err := cli.client.ServerVersion(context.Background())

-	if err == nil {

-		vd.Server = &serverVersion

-	}

-

-	// first we need to make BuildTime more human friendly

-	t, errTime := time.Parse(time.RFC3339Nano, vd.Client.BuildTime)

-	if errTime == nil {

-		vd.Client.BuildTime = t.Format(time.ANSIC)

-	}

-

-	if vd.ServerOK() {

-		t, errTime = time.Parse(time.RFC3339Nano, vd.Server.BuildTime)

-		if errTime == nil {

-			vd.Server.BuildTime = t.Format(time.ANSIC)

-		}

-	}

-

-	if err2 := tmpl.Execute(cli.out, vd); err2 != nil && err == nil {

-		err = err2

-	}

-	cli.out.Write([]byte{'\n'})

-	return err

-}

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

 	"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/system"

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

 	"github.com/docker/docker/cli"

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

@@ -58,6 +59,7 @@ func NewCobraAdaptor(clientFlags *cliflags.ClientFlags) CobraAdaptor {

 		image.NewImportCommand(dockerCli),

 		image.NewTagCommand(dockerCli),

 		network.NewNetworkCommand(dockerCli),

+		system.NewVersionCommand(dockerCli),

 		volume.NewVolumeCommand(dockerCli),

 	)

@@ -24,7 +24,6 @@ var DockerCommandUsage = []Command{

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

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

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

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

 }

 // DockerCommands stores all the docker command