浏览代码

Fix downlevel regression

Signed-off-by: John Howard <jhoward@microsoft.com>
John Howard 7 年之前
父节点
当前提交
f9b2a20819
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 1 2
      api/types/types.go
  2. 1 2
      daemon/inspect.go

+ 1 - 2
api/types/types.go

@@ -15,7 +15,6 @@ import (
 	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/registry"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/docker/api/types/swarm"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-connections/nat"
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 )
 
 
 // RootFS returns Image's RootFS description including the layer IDs.
 // RootFS returns Image's RootFS description including the layer IDs.
@@ -328,7 +327,7 @@ type ContainerJSONBase struct {
 	Name            string
 	Name            string
 	RestartCount    int
 	RestartCount    int
 	Driver          string
 	Driver          string
-	Platform        specs.Platform
+	Platform        string
 	MountLabel      string
 	MountLabel      string
 	ProcessLabel    string
 	ProcessLabel    string
 	AppArmorProfile string
 	AppArmorProfile string

+ 1 - 2
daemon/inspect.go

@@ -13,7 +13,6 @@ import (
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/network"
 	volumestore "github.com/docker/docker/volume/store"
 	volumestore "github.com/docker/docker/volume/store"
 	"github.com/docker/go-connections/nat"
 	"github.com/docker/go-connections/nat"
-	specs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 )
 
 
 // ContainerInspect returns low-level information about a
 // ContainerInspect returns low-level information about a
@@ -172,7 +171,7 @@ func (daemon *Daemon) getInspectData(container *container.Container) (*types.Con
 		Name:         container.Name,
 		Name:         container.Name,
 		RestartCount: container.RestartCount,
 		RestartCount: container.RestartCount,
 		Driver:       container.Driver,
 		Driver:       container.Driver,
-		Platform:     specs.Platform{OS: container.OS},
+		Platform:     container.OS,
 		MountLabel:   container.MountLabel,
 		MountLabel:   container.MountLabel,
 		ProcessLabel: container.ProcessLabel,
 		ProcessLabel: container.ProcessLabel,
 		ExecIDs:      container.GetExecIDs(),
 		ExecIDs:      container.GetExecIDs(),