mirror of
https://github.com/containers/podman.git
synced 2025-09-27 08:43:52 +08:00
Bump github.com/containers/common from 0.22.0 to 0.23.0
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:
![27856297+dependabot-preview[bot]@users.noreply.github.com](/assets/img/avatar_default.png)
committed by
Daniel J Walsh

parent
90c2cc6c83
commit
017f8d6a63
18
vendor/github.com/containers/common/pkg/auth/cli.go
generated
vendored
18
vendor/github.com/containers/common/pkg/auth/cli.go
generated
vendored
@ -3,6 +3,7 @@ package auth
|
||||
import (
|
||||
"io"
|
||||
|
||||
"github.com/containers/common/pkg/completion"
|
||||
"github.com/spf13/pflag"
|
||||
)
|
||||
|
||||
@ -49,6 +50,16 @@ func GetLoginFlags(flags *LoginOptions) *pflag.FlagSet {
|
||||
return &fs
|
||||
}
|
||||
|
||||
// GetLoginFlagsCompletions returns the FlagCompletions for the login flags
|
||||
func GetLoginFlagsCompletions() completion.FlagCompletions {
|
||||
flagCompletion := completion.FlagCompletions{}
|
||||
flagCompletion["authfile"] = completion.AutocompleteDefault
|
||||
flagCompletion["cert-dir"] = completion.AutocompleteDefault
|
||||
flagCompletion["password"] = completion.AutocompleteNone
|
||||
flagCompletion["username"] = completion.AutocompleteNone
|
||||
return flagCompletion
|
||||
}
|
||||
|
||||
// GetLogoutFlags defines and returns logout flags for containers tools
|
||||
func GetLogoutFlags(flags *LogoutOptions) *pflag.FlagSet {
|
||||
fs := pflag.FlagSet{}
|
||||
@ -56,3 +67,10 @@ func GetLogoutFlags(flags *LogoutOptions) *pflag.FlagSet {
|
||||
fs.BoolVarP(&flags.All, "all", "a", false, "Remove the cached credentials for all registries in the auth file")
|
||||
return &fs
|
||||
}
|
||||
|
||||
// GetLogoutFlagsCompletions returns the FlagCompletions for the logout flags
|
||||
func GetLogoutFlagsCompletions() completion.FlagCompletions {
|
||||
flagCompletion := completion.FlagCompletions{}
|
||||
flagCompletion["authfile"] = completion.AutocompleteDefault
|
||||
return flagCompletion
|
||||
}
|
||||
|
26
vendor/github.com/containers/common/pkg/completion/completion.go
generated
vendored
Normal file
26
vendor/github.com/containers/common/pkg/completion/completion.go
generated
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
package completion
|
||||
|
||||
import "github.com/spf13/cobra"
|
||||
|
||||
// FlagCompletions - hold flag completion functions to be applied later with CompleteCommandFlags()
|
||||
type FlagCompletions map[string]func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective)
|
||||
|
||||
// CompleteCommandFlags - Add completion functions for each flagname in FlagCompletions.
|
||||
func CompleteCommandFlags(cmd *cobra.Command, flags FlagCompletions) {
|
||||
for flagName, completionFunc := range flags {
|
||||
_ = cmd.RegisterFlagCompletionFunc(flagName, completionFunc)
|
||||
}
|
||||
}
|
||||
|
||||
/* Autocomplete Functions for cobra ValidArgsFunction */
|
||||
|
||||
// AutocompleteNone - Block the default shell completion (no paths)
|
||||
func AutocompleteNone(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
|
||||
return nil, cobra.ShellCompDirectiveNoFileComp
|
||||
}
|
||||
|
||||
// AutocompleteDefault - Use the default shell completion,
|
||||
// allows path completion.
|
||||
func AutocompleteDefault(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
|
||||
return nil, cobra.ShellCompDirectiveDefault
|
||||
}
|
15
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
15
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@ -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
3
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
@ -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
2
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@ -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
2
vendor/github.com/containers/common/pkg/config/libpodConfig.go
generated
vendored
@ -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()
|
||||
|
||||
|
2
vendor/github.com/containers/common/pkg/seccomp/default_linux.go
generated
vendored
2
vendor/github.com/containers/common/pkg/seccomp/default_linux.go
generated
vendored
@ -99,7 +99,6 @@ func DefaultProfile() *Seccomp {
|
||||
"fchdir",
|
||||
"fchmod",
|
||||
"fchmodat",
|
||||
"fchmodat2",
|
||||
"fchown",
|
||||
"fchown32",
|
||||
"fchownat",
|
||||
@ -221,6 +220,7 @@ func DefaultProfile() *Seccomp {
|
||||
"openat",
|
||||
"openat2",
|
||||
"pause",
|
||||
"pidfd_getfd",
|
||||
"pipe",
|
||||
"pipe2",
|
||||
"pivot_root",
|
||||
|
2
vendor/github.com/containers/common/pkg/seccomp/seccomp.json
generated
vendored
2
vendor/github.com/containers/common/pkg/seccomp/seccomp.json
generated
vendored
@ -101,7 +101,6 @@
|
||||
"fchdir",
|
||||
"fchmod",
|
||||
"fchmodat",
|
||||
"fchmodat2",
|
||||
"fchown",
|
||||
"fchown32",
|
||||
"fchownat",
|
||||
@ -223,6 +222,7 @@
|
||||
"openat",
|
||||
"openat2",
|
||||
"pause",
|
||||
"pidfd_getfd",
|
||||
"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.22.0"
|
||||
const Version = "0.23.0"
|
||||
|
Reference in New Issue
Block a user