diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-23 09:22:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-23 09:22:12 -0700 |
| commit | 8ff974248084f752d328d7a8d1cd6af2959bc3fd (patch) | |
| tree | 06e527e0f1c8b1736d6af2c1bb53d2e856099872 /libpod/container_inspect.go | |
| parent | c019830a750d3c2cdb20d2568c9e0f9fdc35165e (diff) | |
| parent | a95d71f1135165ae51c28b49275e5a3948fbbd2b (diff) | |
| download | podman-8ff974248084f752d328d7a8d1cd6af2959bc3fd.tar.gz podman-8ff974248084f752d328d7a8d1cd6af2959bc3fd.tar.bz2 podman-8ff974248084f752d328d7a8d1cd6af2959bc3fd.zip | |
Merge pull request #1687 from rhatdan/vendor
Move selinux label reservations to containers storage.
Diffstat (limited to 'libpod/container_inspect.go')
| -rw-r--r-- | libpod/container_inspect.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index f2e54aeef..9b07198bc 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -79,9 +79,9 @@ func (c *Container) getContainerInspectData(size bool, driverData *inspect.Data) Name: config.Name, Driver: driverData.Name, MountLabel: config.MountLabel, + ProcessLabel: config.ProcessLabel, EffectiveCaps: spec.Process.Capabilities.Effective, BoundingCaps: spec.Process.Capabilities.Bounding, - ProcessLabel: spec.Process.SelinuxLabel, AppArmorProfile: spec.Process.ApparmorProfile, ExecIDs: execIDs, GraphDriver: driverData, @@ -93,6 +93,7 @@ func (c *Container) getContainerInspectData(size bool, driverData *inspect.Data) HairpinMode: false, // TODO LinkLocalIPv6Address: "", // TODO - do we even support IPv6? LinkLocalIPv6PrefixLen: 0, // TODO - do we even support IPv6? + Ports: []ocicni.PortMapping{}, // TODO - maybe worth it to put this in Docker format? SandboxKey: "", // Network namespace path SecondaryIPAddresses: nil, // TODO - do we support this? |