Fix downlevel regression

Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f9b2a20819e7b29ce4dee46d87e8c32ae7ca9899
Component: engine
This commit is contained in:
John Howard
2017-10-09 13:47:28 -07:00
parent 9de8f7c5a8
commit 3730192eec
2 changed files with 2 additions and 4 deletions
+1 -2
View File
@@ -15,7 +15,6 @@ import (
"github.com/docker/docker/api/types/registry"
"github.com/docker/docker/api/types/swarm"
"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.
@@ -328,7 +327,7 @@ type ContainerJSONBase struct {
Name string
RestartCount int
Driver string
Platform specs.Platform
Platform string
MountLabel string
ProcessLabel string
AppArmorProfile string
+1 -2
View File
@@ -13,7 +13,6 @@ import (
"github.com/docker/docker/daemon/network"
volumestore "github.com/docker/docker/volume/store"
"github.com/docker/go-connections/nat"
specs "github.com/opencontainers/image-spec/specs-go/v1"
)
// ContainerInspect returns low-level information about a
@@ -172,7 +171,7 @@ func (daemon *Daemon) getInspectData(container *container.Container) (*types.Con
Name: container.Name,
RestartCount: container.RestartCount,
Driver: container.Driver,
Platform: specs.Platform{OS: container.OS},
Platform: container.OS,
MountLabel: container.MountLabel,
ProcessLabel: container.ProcessLabel,
ExecIDs: container.GetExecIDs(),