diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-06 15:52:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-06 15:52:25 -0400 |
| commit | b8ad7f241aba622b23b2cfab6fb5284cd26125e3 (patch) | |
| tree | f957873174291cfc4380478c43cf265757cbaf0c /cmd/podman/common/create.go | |
| parent | 1a60550bef976a57777c75e055ad35ff8cf87f23 (diff) | |
| parent | c4023a9302c81f04865646d765caf58ccf556cae (diff) | |
| download | podman-b8ad7f241aba622b23b2cfab6fb5284cd26125e3.tar.gz podman-b8ad7f241aba622b23b2cfab6fb5284cd26125e3.tar.bz2 podman-b8ad7f241aba622b23b2cfab6fb5284cd26125e3.zip | |
Merge pull request #6870 from rhatdan/v2.0
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 b7940fb87..ee7f957cc 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -329,8 +329,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)", ) |