diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-07 15:01:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 15:01:27 -0700 |
| commit | c817ea1b33966c2f1f089b5c086df8cc45437065 (patch) | |
| tree | eccc53908a469d5b71234bebf5957a70a8f9fd3a /cmd/podman | |
| parent | 589261f275b485d78a6ac1bd7b95578257fc020f (diff) | |
| parent | 118cf1fc634ffc63b908d6b082ffc3a53553a6af (diff) | |
| download | podman-c817ea1b33966c2f1f089b5c086df8cc45437065.tar.gz podman-c817ea1b33966c2f1f089b5c086df8cc45437065.tar.bz2 podman-c817ea1b33966c2f1f089b5c086df8cc45437065.zip | |
Merge pull request #4032 from rhatdan/pids-limit
Setup a reasonable default for pids-limit 4096
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/common.go | 5 | ||||
| -rw-r--r-- | cmd/podman/shared/create.go | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 0115e6ef1..2a3f8f3ad 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -11,6 +11,7 @@ import ( "github.com/containers/libpod/cmd/podman/shared" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/rootless" + "github.com/containers/libpod/pkg/sysinfo" "github.com/fatih/camelcase" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" @@ -374,8 +375,8 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { "PID namespace to use", ) createFlags.Int64( - "pids-limit", 0, - "Tune container pids limit (set -1 for unlimited)", + "pids-limit", sysinfo.GetDefaultPidsLimit(), + "Tune container pids limit (set 0 for unlimited)", ) createFlags.String( "pod", "", diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index c9b05d2c4..9020613c5 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -686,6 +686,11 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. logDriver = c.String("log-driver") } + pidsLimit := c.Int64("pids-limit") + if c.String("cgroups") == "disabled" && !c.Changed("pids-limit") { + pidsLimit = 0 + } + config := &cc.CreateConfig{ Annotations: annotations, BuiltinImgVolumes: ImageVolumes, @@ -764,7 +769,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. MemorySwappiness: int(memorySwappiness), KernelMemory: memoryKernel, OomScoreAdj: c.Int("oom-score-adj"), - PidsLimit: c.Int64("pids-limit"), + PidsLimit: pidsLimit, Ulimit: c.StringSlice("ulimit"), }, RestartPolicy: c.String("restart"), |