diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-18 16:14:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-18 16:14:52 +0200 |
| commit | ade0d8778f39b854fed3523bc17afbd98cc5a886 (patch) | |
| tree | a6c7a77c97620a8585016ed28ddbfada4029b584 /cmd/podman/shared/intermediate.go | |
| parent | 22e62e8691495dd5385e23e51901b357e2891a74 (diff) | |
| parent | 0b57e77d7c1c54706611c9ca15e352425adb05e5 (diff) | |
| download | podman-ade0d8778f39b854fed3523bc17afbd98cc5a886.tar.gz podman-ade0d8778f39b854fed3523bc17afbd98cc5a886.tar.bz2 podman-ade0d8778f39b854fed3523bc17afbd98cc5a886.zip | |
Merge pull request #3509 from giuseppe/cgroup-namespace
libpod: support for cgroup namespace
Diffstat (limited to 'cmd/podman/shared/intermediate.go')
| -rw-r--r-- | cmd/podman/shared/intermediate.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/podman/shared/intermediate.go b/cmd/podman/shared/intermediate.go index 8337dc647..4062ac48a 100644 --- a/cmd/podman/shared/intermediate.go +++ b/cmd/podman/shared/intermediate.go @@ -370,6 +370,7 @@ func NewIntermediateLayer(c *cliconfig.PodmanCommand, remote bool) GenericCLIRes m["blkio-weight-device"] = newCRStringSlice(c, "blkio-weight-device") m["cap-add"] = newCRStringSlice(c, "cap-add") m["cap-drop"] = newCRStringSlice(c, "cap-drop") + m["cgroupns"] = newCRString(c, "cgroupns") m["cgroup-parent"] = newCRString(c, "cgroup-parent") m["cidfile"] = newCRString(c, "cidfile") m["conmon-pidfile"] = newCRString(c, "conmon-pidfile") |