diff options
| author | haircommander <pehunt@redhat.com> | 2018-08-20 17:56:35 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-23 18:16:28 +0000 |
| commit | 0e6266858a913ac36de0726ede10d5d03af533e3 (patch) | |
| tree | 152c7b8b029d5eb80c6caf466c9d0ab1b0ef3913 /libpod/container.go | |
| parent | 2a7449362f2884d9ae6a783c0ce38979d882e2cf (diff) | |
| download | podman-0e6266858a913ac36de0726ede10d5d03af533e3.tar.gz podman-0e6266858a913ac36de0726ede10d5d03af533e3.tar.bz2 podman-0e6266858a913ac36de0726ede10d5d03af533e3.zip | |
Fixing network ns segfault
As well as small style corrections, update pod_top_test to use CreatePod, and move handling of adding a container to the pod's namespace from container_internal_linux to libpod/option.
Signed-off-by: haircommander <pehunt@redhat.com>
Closes: #1187
Approved by: mheon
Diffstat (limited to 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libpod/container.go b/libpod/container.go index 28e451225..ea6cd2ac4 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -252,19 +252,6 @@ type ContainerConfig struct { UTSNsCtr string `json:"utsNsCtr,omitempty"` CgroupNsCtr string `json:"cgroupNsCtr,omitempty"` - // Whether container shares an NS with the pod - // NetNsPod conflicts with the CreateNetNS bool - // {namespace}NsPod conflicts with {namespace}NsCtr - // The pause container will be considered dependencies of the given container - // It must be started before the given container is started - IPCNsPod bool `json:"ipcNsPod,omitempty"` - MountNsPod bool `json:"mountNsPod,omitempty"` - NetNsPod bool `json:"netNsPod,omitempty"` - PIDNsPod bool `json:"pidNsPod,omitempty"` - UserNsPod bool `json:"userNsPod,omitempty"` - UTSNsPod bool `json:"utsNsPod,omitempty"` - CgroupNsPod bool `json:"cgroupNsPod,omitempty"` - // IDs of dependency containers. // These containers must be started before this container is started. Dependencies []string |