opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-11-04 00:50:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump github.com/containers/common from 0.22.0 to 0.23.0

Browse Source 
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.22.0 to 0.23.0.
- [Release notes](https://github.com/containers/common/releases)
- [Commits](https://github.com/containers/common/compare/v0.22.0...v0.23.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
dependabot-preview[bot]
2020-09-25 08:16:44 +00:00
committed by Daniel J Walsh
parent 90c2cc6c83
commit 017f8d6a63
20 changed files with 926 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
vendor/github.com/containers/common/pkg/config/config.go generated vendored
View File

@ -183,6 +183,10 @@ type ContainersConfig struct {
// EngineConfig contains configuration options used to set up a engine runtime
type EngineConfig struct {
// ImageBuildFormat indicates the default image format to building
// container images. Valid values are "oci" (default) or "docker".
ImageBuildFormat string `toml:"image_build_format,omitempty"`
// CgroupCheck indicates the configuration has been rewritten after an
// upgrade to Fedora 31 to change the default OCI runtime for cgroupv2v2.
CgroupCheck bool `toml:"cgroup_check,omitempty"`
@ -309,7 +313,7 @@ type EngineConfig struct {
RuntimeSupportsNoCgroups []string `toml:"runtime_supports_nocgroupv2,omitempty"`
// RuntimeSupportsKVM is a list of OCI runtimes that support
// KVM separation for conatainers.
// KVM separation for containers.
RuntimeSupportsKVM []string `toml:"runtime_supports_kvm,omitempty"`
// SetOptions contains a subset of config options. It's used to indicate if
@ -980,8 +984,15 @@ func (c *Config) ActiveDestination() (uri, identity string, err error) {
}
return uri, identity, nil
}
connEnv := os.Getenv("CONTAINER_CONNECTION")
switch {
case connEnv != "":
d, found := c.Engine.ServiceDestinations[connEnv]
if !found {
return "", "", errors.Errorf("environment variable CONTAINER_CONNECTION=%q service destination not found", connEnv)
}
return d.URI, d.Identity, nil
case c.Engine.ActiveService != "":
d, found := c.Engine.ServiceDestinations[c.Engine.ActiveService]
if !found {

3
vendor/github.com/containers/common/pkg/config/containers.conf generated vendored
View File

@ -243,6 +243,9 @@
# network_config_dir = "/etc/cni/net.d/"
[engine]
# ImageBuildFormat indicates the default image format to building
# container images. Valid values are "oci" (default) or "docker".
# image_build_format = "oci"
# Cgroup management implementation used for the runtime.
# Valid options "systemd" or "cgroupfs"

2
vendor/github.com/containers/common/pkg/config/default.go generated vendored
View File

@ -250,6 +250,8 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
if cgroup2, _ := cgroupv2.Enabled(); cgroup2 {
c.OCIRuntime = "crun"
}
c.ImageBuildFormat = "oci"
c.CgroupManager = defaultCgroupManager()
c.StopTimeout = uint(10)

2
vendor/github.com/containers/common/pkg/config/libpodConfig.go generated vendored
View File

@ -186,7 +186,7 @@ type ConfigFromLibpod struct {
// with cgroupv2v2. Other OCI runtimes are not yet supporting cgroupv2v2. This
// might change in the future.
func newLibpodConfig(c *Config) error {
// Start with the default config and interatively merge
// Start with the default config and iteratively merge
// fields in the system configs.
config := c.libpodConfig()