diff options
| author | Urvashi Mohnani <umohnani@redhat.com> | 2021-09-29 16:22:55 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2021-10-19 13:55:41 -0400 |
| commit | 14509a92bb87bc328c67182b9e985fd81f6f7b53 (patch) | |
| tree | e7176a7ce73949cbf274a82ea4077fbffab02520 /cmd | |
| parent | c15c1540837b25305729bc72d61372098e204151 (diff) | |
| download | podman-14509a92bb87bc328c67182b9e985fd81f6f7b53.tar.gz podman-14509a92bb87bc328c67182b9e985fd81f6f7b53.tar.bz2 podman-14509a92bb87bc328c67182b9e985fd81f6f7b53.zip | |
Allow a value of -1 to set unlimited pids limit
Users can set --pids-limit to -1 now to set unlimited
pids limit for a container - this matches the convention.
[NO TESTS NEEDED]
Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/common/create.go | 2 | ||||
| -rw-r--r-- | cmd/podman/containers/create.go | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go index f3bf2c0a2..b3dfc4967 100644 --- a/cmd/podman/common/create.go +++ b/cmd/podman/common/create.go @@ -433,7 +433,7 @@ func DefineCreateFlags(cmd *cobra.Command, cf *entities.ContainerCreateOptions, pidsLimitFlagName := "pids-limit" createFlags.Int64( pidsLimitFlagName, pidsLimit(), - "Tune container pids limit (set 0 for unlimited, -1 for server defaults)", + "Tune container pids limit (set -1 for unlimited)", ) _ = cmd.RegisterFlagCompletionFunc(pidsLimitFlagName, completion.AutocompleteNone) diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 8b27de53e..aa34f9ba5 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -224,6 +224,10 @@ func CreateInit(c *cobra.Command, vals entities.ContainerCreateOptions, isInfra if c.Flags().Changed("pids-limit") { val := c.Flag("pids-limit").Value.String() + // Convert -1 to 0, so that -1 maps to unlimited pids limit + if val == "-1" { + val = "0" + } pidsLimit, err := strconv.ParseInt(val, 10, 32) if err != nil { return vals, err |