opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-10 07:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6842 from rhatdan/pids-limit

Browse Source 
Pids-limit should only be set if the user set it
This commit is contained in:
OpenShift Merge Robot
2020-07-13 20:53:20 +02:00
committed by GitHub
parent e2a8e037d1 677ad10e07
commit d86acf2cae
6 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/specgen/generate/container.go
View File

@@ -10,6 +10,7 @@ import (
envLib "github.com/containers/libpod/v2/pkg/env"
"github.com/containers/libpod/v2/pkg/signal"
"github.com/containers/libpod/v2/pkg/specgen"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"golang.org/x/sys/unix"
)
@@ -169,6 +170,21 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
}
}
// If caller did not specify Pids Limits load default
if s.ResourceLimits == nil || s.ResourceLimits.Pids == nil {
if s.CgroupsMode != "disabled" {
limit := rtc.PidsLimit()
if limit != 0 {
if s.ResourceLimits == nil {
s.ResourceLimits = &spec.LinuxResources{}
}
s.ResourceLimits.Pids = &spec.LinuxPids{
Limit: limit,
}
}
}
}
return verifyContainerResources(s)
}