mirror of
https://github.com/containers/podman.git
synced 2025-09-28 17:25:31 +08:00
Bump github.com/containers/common from 0.31.0 to 0.31.1
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.31.0 to 0.31.1. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.31.0...v0.31.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
![27856297+dependabot-preview[bot]@users.noreply.github.com](/assets/img/avatar_default.png)
committed by
Valentin Rothberg

parent
a17afa931d
commit
641046a79e
16
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
16
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@ -586,6 +586,22 @@ func (c *Config) Validate() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *EngineConfig) findRuntime() string {
|
||||
// Search for crun first followed by runc and kata
|
||||
for _, name := range []string{"crun", "runc", "kata"} {
|
||||
for _, v := range c.OCIRuntimes[name] {
|
||||
if _, err := os.Stat(v); err == nil {
|
||||
return name
|
||||
}
|
||||
}
|
||||
if path, err := exec.LookPath(name); err == nil {
|
||||
logrus.Warningf("Found default OCIruntime %s path which is missing from [engine.runtimes] in containers.conf", path)
|
||||
return name
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// Validate is the main entry point for Engine configuration validation
|
||||
// It returns an `error` on validation failure, otherwise
|
||||
// `nil`.
|
||||
|
22
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
22
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
@ -425,18 +425,8 @@ default_sysctls = [
|
||||
# Path to file containing ssh identity key
|
||||
# identity = "~/.ssh/id_rsa"
|
||||
|
||||
# Paths to look for a valid OCI runtime (runc, runv, kata, etc)
|
||||
# Paths to look for a valid OCI runtime (crun, runc, kata, etc)
|
||||
[engine.runtimes]
|
||||
# runc = [
|
||||
# "/usr/bin/runc",
|
||||
# "/usr/sbin/runc",
|
||||
# "/usr/local/bin/runc",
|
||||
# "/usr/local/sbin/runc",
|
||||
# "/sbin/runc",
|
||||
# "/bin/runc",
|
||||
# "/usr/lib/cri-o-runc/sbin/runc",
|
||||
# ]
|
||||
|
||||
# crun = [
|
||||
# "/usr/bin/crun",
|
||||
# "/usr/sbin/crun",
|
||||
@ -447,6 +437,16 @@ default_sysctls = [
|
||||
# "/run/current-system/sw/bin/crun",
|
||||
# ]
|
||||
|
||||
# runc = [
|
||||
# "/usr/bin/runc",
|
||||
# "/usr/sbin/runc",
|
||||
# "/usr/local/bin/runc",
|
||||
# "/usr/local/sbin/runc",
|
||||
# "/sbin/runc",
|
||||
# "/bin/runc",
|
||||
# "/usr/lib/cri-o-runc/sbin/runc",
|
||||
# ]
|
||||
|
||||
# kata = [
|
||||
# "/usr/bin/kata-runtime",
|
||||
# "/usr/sbin/kata-runtime",
|
||||
|
22
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
22
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@ -242,7 +242,6 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
c.ImageDefaultTransport = _defaultTransport
|
||||
c.StateType = BoltDBStateStore
|
||||
|
||||
c.OCIRuntime = "crun"
|
||||
c.ImageBuildFormat = "oci"
|
||||
|
||||
c.CgroupManager = defaultCgroupManager()
|
||||
@ -250,6 +249,15 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
|
||||
c.Remote = isRemote()
|
||||
c.OCIRuntimes = map[string][]string{
|
||||
"crun": {
|
||||
"/usr/bin/crun",
|
||||
"/usr/sbin/crun",
|
||||
"/usr/local/bin/crun",
|
||||
"/usr/local/sbin/crun",
|
||||
"/sbin/crun",
|
||||
"/bin/crun",
|
||||
"/run/current-system/sw/bin/crun",
|
||||
},
|
||||
"runc": {
|
||||
"/usr/bin/runc",
|
||||
"/usr/sbin/runc",
|
||||
@ -260,15 +268,6 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
"/usr/lib/cri-o-runc/sbin/runc",
|
||||
"/run/current-system/sw/bin/runc",
|
||||
},
|
||||
"crun": {
|
||||
"/usr/bin/crun",
|
||||
"/usr/sbin/crun",
|
||||
"/usr/local/bin/crun",
|
||||
"/usr/local/sbin/crun",
|
||||
"/sbin/crun",
|
||||
"/bin/crun",
|
||||
"/run/current-system/sw/bin/crun",
|
||||
},
|
||||
"kata": {
|
||||
"/usr/bin/kata-runtime",
|
||||
"/usr/sbin/kata-runtime",
|
||||
@ -280,6 +279,9 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
"/usr/bin/kata-fc",
|
||||
},
|
||||
}
|
||||
// Needs to be called after populating c.OCIRuntimes
|
||||
c.OCIRuntime = c.findRuntime()
|
||||
|
||||
c.ConmonEnvVars = []string{
|
||||
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
}
|
||||
|
3
vendor/github.com/containers/common/pkg/seccomp/default_linux.go
generated
vendored
3
vendor/github.com/containers/common/pkg/seccomp/default_linux.go
generated
vendored
@ -75,6 +75,7 @@ func DefaultProfile() *Seccomp {
|
||||
"clock_nanosleep_time64",
|
||||
"clone",
|
||||
"close",
|
||||
"close_range",
|
||||
"connect",
|
||||
"copy_file_range",
|
||||
"creat",
|
||||
@ -226,6 +227,8 @@ func DefaultProfile() *Seccomp {
|
||||
"openat2",
|
||||
"pause",
|
||||
"pidfd_getfd",
|
||||
"pidfd_open",
|
||||
"pidfd_send_signal",
|
||||
"pipe",
|
||||
"pipe2",
|
||||
"pivot_root",
|
||||
|
3
vendor/github.com/containers/common/pkg/seccomp/seccomp.json
generated
vendored
3
vendor/github.com/containers/common/pkg/seccomp/seccomp.json
generated
vendored
@ -77,6 +77,7 @@
|
||||
"clock_nanosleep_time64",
|
||||
"clone",
|
||||
"close",
|
||||
"close_range",
|
||||
"connect",
|
||||
"copy_file_range",
|
||||
"creat",
|
||||
@ -227,6 +228,8 @@
|
||||
"openat2",
|
||||
"pause",
|
||||
"pidfd_getfd",
|
||||
"pidfd_open",
|
||||
"pidfd_send_signal",
|
||||
"pipe",
|
||||
"pipe2",
|
||||
"pivot_root",
|
||||
|
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.31.0"
|
||||
const Version = "0.31.2-dev"
|
||||
|
Reference in New Issue
Block a user