mirror of
https://github.com/containers/podman.git
synced 2025-12-01 10:38:05 +08:00
Vendor in new version of Buildah
This also pulls in latest runc and containers/common Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
14
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
14
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@@ -11,7 +11,6 @@ import (
|
||||
|
||||
"github.com/containers/common/pkg/apparmor"
|
||||
"github.com/containers/common/pkg/cgroupv2"
|
||||
"github.com/containers/common/pkg/sysinfo"
|
||||
"github.com/containers/storage"
|
||||
"github.com/containers/storage/pkg/unshare"
|
||||
"github.com/opencontainers/selinux/go-selinux"
|
||||
@@ -484,15 +483,16 @@ func (c *Config) Ulimits() []string {
|
||||
// PidsLimit returns the default maximum number of pids to use in containers
|
||||
func (c *Config) PidsLimit() int64 {
|
||||
if unshare.IsRootless() {
|
||||
if c.Engine.CgroupManager == SystemdCgroupsManager {
|
||||
cgroup2, _ := cgroupv2.Enabled()
|
||||
if cgroup2 {
|
||||
return c.Containers.PidsLimit
|
||||
}
|
||||
if c.Engine.CgroupManager != SystemdCgroupsManager {
|
||||
return 0
|
||||
}
|
||||
cgroup2, _ := cgroupv2.Enabled()
|
||||
if !cgroup2 {
|
||||
return 0
|
||||
}
|
||||
}
|
||||
return sysinfo.GetDefaultPidsLimit()
|
||||
|
||||
return c.Containers.PidsLimit
|
||||
}
|
||||
|
||||
// DetachKeys returns the default detach keys to detach from a container
|
||||
|
||||
2
vendor/github.com/containers/common/version/version.go
generated
vendored
2
vendor/github.com/containers/common/version/version.go
generated
vendored
@@ -1,4 +1,4 @@
|
||||
package version
|
||||
|
||||
// Version is the version of the build.
|
||||
const Version = "0.15.1"
|
||||
const Version = "0.15.2"
|
||||
|
||||
Reference in New Issue
Block a user