Merge pull request #15029 from azurezk/add-version-info

Add docker version info in /info request

api/client/info.go

@@ -35,6 +35,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
 
 	fmt.Fprintf(cli.out, "Containers: %d\n", info.Containers)
 	fmt.Fprintf(cli.out, "Images: %d\n", info.Images)
+	fmt.Fprintf(cli.out, "Engine Version: %s\n", info.ServerVersion)
 	ioutils.FprintfIfNotEmpty(cli.out, "Storage Driver: %s\n", info.Driver)
 	if info.DriverStatus != nil {
 		for _, pair := range info.DriverStatus {

api/types/types.go

@@ -215,6 +215,7 @@ type Info struct {
 	Name               string
 	Labels             []string
 	ExperimentalBuild  bool
+	ServerVersion      string
 }
 
 // ExecStartCheck is a temp struct used by execStart

daemon/info.go

@@ -90,6 +90,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
 		DockerRootDir:      daemon.config().Root,
 		Labels:             daemon.config().Labels,
 		ExperimentalBuild:  utils.ExperimentalBuild(),
+		ServerVersion:      dockerversion.VERSION,
 	}
 
 	// TODO Windows. Refactor this more once sysinfo is refactored into

docs/reference/api/docker_remote_api.md

@@ -88,6 +88,7 @@ This section lists each version from latest to oldest.  Each listing includes a
 list of DNS options to be used in the container.
 * `POST /build` now optionally takes a serialized map of build-time variables.
 * `GET /events` now includes a `timenano` field, in addition to the existing `time` field.
+* `GET /info` now lists engine version information.
 
 ### v1.20 API changes
 

docs/reference/api/docker_remote_api_v1.21.md

@@ -1860,6 +1860,7 @@ Display system-wide information
         },
         "SwapLimit": false,
         "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
+        "ServerVersion": "1.9.0"
     }
 
 Status Codes:

docs/reference/commandline/info.md

@@ -21,6 +21,7 @@ For example:
     $ docker -D info
     Containers: 14
     Images: 52
+    Engine Version: 1.9.0
     Storage Driver: aufs
      Root Dir: /var/lib/docker/aufs
      Backing Filesystem: extfs

integration-cli/docker_api_info_test.go

@@ -25,7 +25,8 @@ func (s *DockerSuite) TestInfoApi(c *check.C) {
 		"NCPU",
 		"MemTotal",
 		"KernelVersion",
-		"Driver"}
+		"Driver",
+		"ServerVersion"}
 
 	out := string(body)
 	for _, linePrefix := range stringsToCheck {

man/docker-info.1.md

@@ -33,6 +33,7 @@ Here is a sample output:
     # docker info
     Containers: 14
     Images: 52
+    Engine Version: 1.9.0
     Storage Driver: aufs
      Root Dir: /var/lib/docker/aufs
      Dirs: 80