add kernel version

api_params.go

@@ -26,6 +26,7 @@ type APIInfo struct {
 	SwapLimit       bool   `json:",omitempty"`
 	LXCVersion      string `json:",omitempty"`
 	NEventsListener int    `json:",omitempty"`
+	KernelVersion   string `json:",omitempty"`
 }
 
 type APITop struct {

commands.go

@@ -473,6 +473,7 @@ func (cli *DockerCli) CmdInfo(args ...string) error {
 		fmt.Fprintf(cli.out, "Goroutines: %d\n", out.NGoroutines)
 		fmt.Fprintf(cli.out, "LXC Version: %s\n", out.LXCVersion)
 		fmt.Fprintf(cli.out, "EventsListeners: %d\n", out.NEventsListener)
+		fmt.Fprintf(cli.out, "Kernel Version: %s\n", out.KernelVersion)
 	}
 	if !out.MemoryLimit {
 		fmt.Fprintf(cli.err, "WARNING: No memory limit support\n")

docs/sources/api/docker_remote_api_v1.3.rst

@@ -989,7 +989,10 @@ Display system-wide information
 		"NFd": 11,
 		"NGoroutines":21,
 		"MemoryLimit":true,
-		"SwapLimit":false
+		"SwapLimit":false,
+		"EventsListeners":"0",
+		"LXCVersion":"0.7.5",
+		"KernelVersion":"3.8.0-19-generic"
 	   }
 
         :statuscode 200: no error

server.go

@@ -218,6 +218,10 @@ func (srv *Server) DockerInfo() *APIInfo {
 			lxcVersion = strings.TrimSpace(strings.SplitN(string(output), ":", 2)[1])
 		}
 	}
+	kernelVersion := "<unknown>"
+	if kv, err := utils.GetKernelVersion(); err == nil {
+		kernelVersion = kv.String()
+	}
 
 	return &APIInfo{
 		Containers:      len(srv.runtime.List()),
@@ -229,6 +233,7 @@ func (srv *Server) DockerInfo() *APIInfo {
 		NGoroutines:     runtime.NumGoroutine(),
 		LXCVersion:      lxcVersion,
 		NEventsListener: len(srv.events),
+		KernelVersion:   kernelVersion,
 	}
 }