kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix downlevel regression

Browse source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2017-10-09 13:47:28 -07:00
parent d9cd40d58b
commit f9b2a20819
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/types/types.go
View file

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

3
daemon/inspect.go
View file

@ -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(),