|
@@ -154,24 +154,46 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
|
|
|
|
|
|
// SystemVersion returns version information about the daemon.
|
|
|
func (daemon *Daemon) SystemVersion() types.Version {
|
|
|
+ kernelVersion := "<unknown>"
|
|
|
+ if kv, err := kernel.GetKernelVersion(); err != nil {
|
|
|
+ logrus.Warnf("Could not get kernel version: %v", err)
|
|
|
+ } else {
|
|
|
+ kernelVersion = kv.String()
|
|
|
+ }
|
|
|
+
|
|
|
v := types.Version{
|
|
|
+ Components: []types.ComponentVersion{
|
|
|
+ {
|
|
|
+ Name: "Engine",
|
|
|
+ Version: dockerversion.Version,
|
|
|
+ Details: map[string]string{
|
|
|
+ "GitCommit": dockerversion.GitCommit,
|
|
|
+ "ApiVersion": api.DefaultVersion,
|
|
|
+ "MinAPIVersion": api.MinVersion,
|
|
|
+ "GoVersion": runtime.Version(),
|
|
|
+ "Os": runtime.GOOS,
|
|
|
+ "Arch": runtime.GOARCH,
|
|
|
+ "BuildTime": dockerversion.BuildTime,
|
|
|
+ "KernelVersion": kernelVersion,
|
|
|
+ "Experimental": fmt.Sprintf("%t", daemon.configStore.Experimental),
|
|
|
+ },
|
|
|
+ },
|
|
|
+ },
|
|
|
+
|
|
|
+ // Populate deprecated fields for older clients
|
|
|
Version: dockerversion.Version,
|
|
|
GitCommit: dockerversion.GitCommit,
|
|
|
+ APIVersion: api.DefaultVersion,
|
|
|
MinAPIVersion: api.MinVersion,
|
|
|
GoVersion: runtime.Version(),
|
|
|
Os: runtime.GOOS,
|
|
|
Arch: runtime.GOARCH,
|
|
|
BuildTime: dockerversion.BuildTime,
|
|
|
+ KernelVersion: kernelVersion,
|
|
|
Experimental: daemon.configStore.Experimental,
|
|
|
}
|
|
|
|
|
|
- kernelVersion := "<unknown>"
|
|
|
- if kv, err := kernel.GetKernelVersion(); err != nil {
|
|
|
- logrus.Warnf("Could not get kernel version: %v", err)
|
|
|
- } else {
|
|
|
- kernelVersion = kv.String()
|
|
|
- }
|
|
|
- v.KernelVersion = kernelVersion
|
|
|
+ v.Platform.Name = dockerversion.PlatformName
|
|
|
|
|
|
return v
|
|
|
}
|