diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-05 09:41:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 09:41:26 -0400 |
| commit | f2432335ef1be0a6a4482354e3c288381127ee49 (patch) | |
| tree | 57940c3e3b9aa2d7626a513d6c0184a6137f0954 /cmd/podman/common | |
| parent | 2f2ffd8678587db040ae76ef0231669ee19a5175 (diff) | |
| parent | 9be0d759b8dc6f1f5967d511c85924cd923b5ae6 (diff) | |
| download | podman-f2432335ef1be0a6a4482354e3c288381127ee49.tar.gz podman-f2432335ef1be0a6a4482354e3c288381127ee49.tar.bz2 podman-f2432335ef1be0a6a4482354e3c288381127ee49.zip | |
Merge pull request #6498 from mheon/fix_pod_hostname
Ensure that containers in pods properly set hostname
Diffstat (limited to 'cmd/podman/common')
| -rw-r--r-- | cmd/podman/common/create.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index 7086dc839..4d4dea0d2 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -50,7 +50,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "Drop capabilities from the container", ) createFlags.String( - "cgroupns", containerConfig.CgroupNS(), + "cgroupns", "", "cgroup namespace to use", ) createFlags.StringVar( @@ -244,7 +244,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "Keep STDIN open even if not attached", ) createFlags.String( - "ipc", containerConfig.IPCNS(), + "ipc", "", "IPC namespace to use", ) createFlags.StringVar( @@ -325,7 +325,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { ) // markFlagHidden(createFlags, "override-os") createFlags.String( - "pid", containerConfig.PidNS(), + "pid", "", "PID namespace to use", ) createFlags.Int64Var( @@ -454,11 +454,11 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "Username or UID (format: <name|uid>[:<group|gid>])", ) createFlags.String( - "userns", containerConfig.Containers.UserNS, + "userns", "", "User namespace to use", ) createFlags.String( - "uts", containerConfig.Containers.UTSNS, + "uts", "", "UTS namespace to use", ) createFlags.StringArrayVar( |