diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-13 20:53:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-13 20:53:20 +0200 |
| commit | d86acf2caea68d1dbf349c54d0532b3ce92dcb85 (patch) | |
| tree | 3191375b0465096dfb1e26a26d9faaa09c0d90ac /cmd/podman/common/create.go | |
| parent | e2a8e037d1c3a2176cd15493812bf165faea63f2 (diff) | |
| parent | 677ad10e0756212bf4fbbed2797d2c110aaa8374 (diff) | |
| download | podman-d86acf2caea68d1dbf349c54d0532b3ce92dcb85.tar.gz podman-d86acf2caea68d1dbf349c54d0532b3ce92dcb85.tar.bz2 podman-d86acf2caea68d1dbf349c54d0532b3ce92dcb85.zip | |
Merge pull request #6842 from rhatdan/pids-limit
Pids-limit should only be set if the user set it
Diffstat (limited to 'cmd/podman/common/create.go')
| -rw-r--r-- | cmd/podman/common/create.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index f6fbe8e10..a26bbf718 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -330,8 +330,7 @@ func GetCreateFlags(cf *ContainerCLIOpts) *pflag.FlagSet { "pid", "", "PID namespace to use", ) - createFlags.Int64Var( - &cf.PIDsLimit, + createFlags.Int64( "pids-limit", containerConfig.PidsLimit(), "Tune container pids limit (set 0 for unlimited, -1 for server defaults)", ) |