From 3730192eec478650cd46a75b1f44a3f9b5f70ebe Mon Sep 17 00:00:00 2001 From: John Howard Date: Mon, 9 Oct 2017 13:47:28 -0700 Subject: [PATCH] Fix downlevel regression Signed-off-by: John Howard Upstream-commit: f9b2a20819e7b29ce4dee46d87e8c32ae7ca9899 Component: engine --- components/engine/api/types/types.go | 3 +-- components/engine/daemon/inspect.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/engine/api/types/types.go b/components/engine/api/types/types.go index dbce05bf32..f7ac772971 100644 --- a/components/engine/api/types/types.go +++ b/components/engine/api/types/types.go @@ -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 diff --git a/components/engine/daemon/inspect.go b/components/engine/daemon/inspect.go index 22551a702c..8b0f109e32 100644 --- a/components/engine/daemon/inspect.go +++ b/components/engine/daemon/inspect.go @@ -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(),