@@ -53,7 +53,8 @@ DOCKER_ENVS := \

 	-e http_proxy \

 	-e https_proxy \

 	-e no_proxy \

-	-e VERSION

+	-e VERSION \

+	-e PLATFORM

 # note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds

 # to allow `make BIND_DIR=. shell` or `make BIND_DIR= test`

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

 	"net/http"

 	"time"

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

 	"github.com/docker/docker/api/server/httputils"

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

 	"github.com/docker/docker/api/types/events"

@@ -65,7 +64,6 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht

 func (s *systemRouter) getVersion(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	info := s.backend.SystemVersion()

-	info.APIVersion = api.DefaultVersion

 	return httputils.WriteJSON(w, http.StatusOK, info)

 }

@@ -6761,6 +6761,28 @@ paths:

           schema:

             type: "object"

             properties:

+              Platform:

+                type: "object"

+                required: [Name]

+                properties:

+                  Name:

+                    type: "string"

+              Components:

+                type: "array"

+                items:

+                  type: "object"

+                  x-go-name: ComponentVersion

+                  required: [Name, Version]

+                  properties:

+                    Name:

+                      type: "string"

+                    Version:

+                      type: "string"

+                      x-nullable: false

+                    Details:

+                      type: "object"

+                      x-nullable: true

+

               Version:

                 type: "string"

               ApiVersion:

@@ -107,9 +107,21 @@ type Ping struct {

 	Experimental bool

 }

+// ComponentVersion describes the version information for a specific component.

+type ComponentVersion struct {

+	Name    string

+	Version string

+	Details map[string]string `json:",omitempty"`

+}

+

 // Version contains response of Engine API:

 // GET "/version"

 type Version struct {

+	Platform   struct{ Name string } `json:",omitempty"`

+	Components []ComponentVersion    `json:",omitempty"`

+

+	// The following fields are deprecated, they relate to the Engine component and are kept for backwards compatibility

+

 	Version       string

 	APIVersion    string `json:"ApiVersion"`

 	MinAPIVersion string `json:"MinAPIVersion,omitempty"`

@@ -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

 }

@@ -13,4 +13,5 @@ const (

 	ContainerdCommitID string = "library-import"

 	RuncCommitID       string = "library-import"

 	InitCommitID       string = "library-import"

+	PlatformName       string = ""

 )

@@ -365,7 +365,7 @@ Try {

     # Run autogen if building binaries or running unit tests.

     if ($Client -or $Daemon -or $TestUnit) {

         Write-Host "INFO: Invoking autogen..."

-        Try { .\hack\make\.go-autogen.ps1 -CommitString $gitCommit -DockerVersion $dockerVersion }

+        Try { .\hack\make\.go-autogen.ps1 -CommitString $gitCommit -DockerVersion $dockerVersion -Platform "$env:PLATFORM" }

         Catch [Exception] { Throw $_ }

     }

@@ -18,6 +18,7 @@ const (

 	BuildTime          string = "$BUILDTIME"

 	IAmStatic          string = "${IAMSTATIC:-true}"

 	ContainerdCommitID string = "${CONTAINERD_COMMIT}"

+	PlatformName       string = "${PLATFORM}"

 )

 // AUTOGENERATED FILE; see /go/src/github.com/docker/docker/hack/make/.go-autogen

@@ -14,7 +14,8 @@

 param(

     [Parameter(Mandatory=$true)][string]$CommitString,

-    [Parameter(Mandatory=$true)][string]$DockerVersion

+    [Parameter(Mandatory=$true)][string]$DockerVersion,

+    [Parameter(Mandatory=$false)][string]$Platform

 )

 $ErrorActionPreference = "Stop"

@@ -43,6 +44,7 @@ const (

     GitCommit          string = "'+$CommitString+'"

     Version            string = "'+$DockerVersion+'"

     BuildTime          string = "'+$buildDateTime+'"

+    PlatformName       string = "'+$Platform+'"

 )

 // AUTOGENERATED FILE; see hack\make\.go-autogen.ps1