Merge pull request #641 from mrunalp/pids_limit

Pids limit
This commit is contained in:
Antonio Murdaca 2017-07-12 12:39:54 +02:00 committed by GitHub
commit 17584facf0
8 changed files with 81 additions and 1 deletions

View file

@ -103,6 +103,9 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
if ctx.GlobalIsSet("cgroup-manager") {
config.CgroupManager = ctx.GlobalString("cgroup-manager")
}
if ctx.GlobalIsSet("pids-limit") {
config.PidsLimit = ctx.GlobalInt64("pids-limit")
}
if ctx.GlobalIsSet("cni-config-dir") {
config.NetworkDir = ctx.GlobalString("cni-config-dir")
}
@ -239,6 +242,11 @@ func main() {
Name: "cgroup-manager",
Usage: "cgroup manager (cgroupfs or systemd)",
},
cli.Int64Flag{
Name: "pids-limit",
Value: server.DefaultPidsLimit,
Usage: "maximum number of processes allowed in a container",
},
cli.StringFlag{
Name: "cni-config-dir",
Usage: "CNI configuration files directory",