summaryrefslogtreecommitdiff
path: root/cmd/podman/shared/create.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-07 15:01:27 -0700
committerGitHub <noreply@github.com>2019-10-07 15:01:27 -0700
commitc817ea1b33966c2f1f089b5c086df8cc45437065 (patch)
treeeccc53908a469d5b71234bebf5957a70a8f9fd3a /cmd/podman/shared/create.go
parent589261f275b485d78a6ac1bd7b95578257fc020f (diff)
parent118cf1fc634ffc63b908d6b082ffc3a53553a6af (diff)
downloadpodman-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/shared/create.go')
-rw-r--r--cmd/podman/shared/create.go7
1 files changed, 6 insertions, 1 deletions
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"),