summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorUrvashi Mohnani <umohnani@redhat.com>2021-09-29 16:22:55 -0400
committerUrvashi Mohnani <umohnani@redhat.com>2021-09-29 16:22:55 -0400
commitc25cc7230fa1d54903728626584d30808539cc04 (patch)
tree436f89e19d5782c348a9e893eeaffd7d0ba1b4cb /cmd/podman
parentd987f26f1e2449d3237faa0b873d82ce5a89e0ee (diff)
downloadpodman-c25cc7230fa1d54903728626584d30808539cc04.tar.gz
podman-c25cc7230fa1d54903728626584d30808539cc04.tar.bz2
podman-c25cc7230fa1d54903728626584d30808539cc04.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/podman')
-rw-r--r--cmd/podman/common/create.go2
-rw-r--r--cmd/podman/containers/create.go4
2 files changed, 5 insertions, 1 deletions
diff --git a/cmd/podman/common/create.go b/cmd/podman/common/create.go
index a969e17e9..e490fa121 100644
--- a/cmd/podman/common/create.go
+++ b/cmd/podman/common/create.go
@@ -421,7 +421,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