mirror of
https://github.com/containers/podman.git
synced 2025-12-08 23:00:23 +08:00
Update common, image, and storage deps
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit is contained in:
committed by
Paul Holzinger
parent
32d96f40c3
commit
444f19cb2a
8
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
8
vendor/github.com/containers/common/pkg/config/config.go
generated
vendored
@@ -584,6 +584,10 @@ type NetworkConfig struct {
|
||||
// are always assigned randomly.
|
||||
DefaultSubnetPools []SubnetPool `toml:"default_subnet_pools,omitempty"`
|
||||
|
||||
// DefaultRootlessNetworkCmd is used to set the default rootless network
|
||||
// program, either "slirp4nents" (default) or "pasta".
|
||||
DefaultRootlessNetworkCmd string `toml:"default_rootless_network_cmd,omitempty"`
|
||||
|
||||
// NetworkConfigDir is where network configuration files are stored.
|
||||
NetworkConfigDir string `toml:"network_config_dir,omitempty"`
|
||||
|
||||
@@ -591,6 +595,10 @@ type NetworkConfig struct {
|
||||
// for netavark rootful bridges with dns enabled. This can be necessary
|
||||
// when other dns forwarders run on the machine. 53 is used if unset.
|
||||
DNSBindPort uint16 `toml:"dns_bind_port,omitempty,omitzero"`
|
||||
|
||||
// PastaOptions contains a default list of pasta(1) options that should
|
||||
// be used when running pasta.
|
||||
PastaOptions []string `toml:"pasta_options,omitempty"`
|
||||
}
|
||||
|
||||
type SubnetPool struct {
|
||||
|
||||
20
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
20
vendor/github.com/containers/common/pkg/config/containers.conf
generated
vendored
@@ -314,9 +314,9 @@ default_sysctls = [
|
||||
#
|
||||
#netavark_plugin_dirs = [
|
||||
# "/usr/local/libexec/netavark",
|
||||
# "/usr/libexec/netavark",
|
||||
# "/usr/local/lib/netavark",
|
||||
# "/usr/lib/netavark",
|
||||
# "/usr/libexec/netavark",
|
||||
# "/usr/local/lib/netavark",
|
||||
# "/usr/lib/netavark",
|
||||
#]
|
||||
|
||||
# The network name of the default network to attach pods to.
|
||||
@@ -344,6 +344,13 @@ default_sysctls = [
|
||||
# {"base" = "10.128.0.0/9", "size" = 24},
|
||||
#]
|
||||
|
||||
|
||||
|
||||
# Configure which rootless network program to use by default. Valid options are
|
||||
# `slirp4netns` (default) and `pasta`.
|
||||
#
|
||||
#default_rootless_network_cmd = "slirp4netns"
|
||||
|
||||
# Path to the directory where network configuration files are located.
|
||||
# For the CNI backend the default is "/etc/cni/net.d" as root
|
||||
# and "$HOME/.config/cni/net.d" as rootless.
|
||||
@@ -359,6 +366,11 @@ default_sysctls = [
|
||||
#
|
||||
#dns_bind_port = 53
|
||||
|
||||
# A list of default pasta options that should be used running pasta.
|
||||
# It accepts the pasta cli options, see pasta(1) for the full list of options.
|
||||
#
|
||||
#pasta_options = []
|
||||
|
||||
[engine]
|
||||
# Index to the active service
|
||||
#
|
||||
@@ -407,7 +419,7 @@ default_sysctls = [
|
||||
# Format is a single character [a-Z] or a comma separated sequence of
|
||||
# `ctrl-<value>`, where `<value>` is one of:
|
||||
# `a-z`, `@`, `^`, `[`, `\`, `]`, `^` or `_`
|
||||
#
|
||||
# Specifying "" disables this feature.
|
||||
#detach_keys = "ctrl-p,ctrl-q"
|
||||
|
||||
# Determines whether engine will reserve ports on the host when they are
|
||||
|
||||
14
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
14
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@@ -215,12 +215,13 @@ func DefaultConfig() (*Config, error) {
|
||||
UserNSSize: DefaultUserNSSize, // Deprecated
|
||||
},
|
||||
Network: NetworkConfig{
|
||||
DefaultNetwork: "podman",
|
||||
DefaultSubnet: DefaultSubnet,
|
||||
DefaultSubnetPools: DefaultSubnetPools,
|
||||
DNSBindPort: 0,
|
||||
CNIPluginDirs: DefaultCNIPluginDirs,
|
||||
NetavarkPluginDirs: DefaultNetavarkPluginDirs,
|
||||
DefaultNetwork: "podman",
|
||||
DefaultSubnet: DefaultSubnet,
|
||||
DefaultSubnetPools: DefaultSubnetPools,
|
||||
DefaultRootlessNetworkCmd: "slirp4netns",
|
||||
DNSBindPort: 0,
|
||||
CNIPluginDirs: DefaultCNIPluginDirs,
|
||||
NetavarkPluginDirs: DefaultNetavarkPluginDirs,
|
||||
},
|
||||
Engine: *defaultEngineConfig,
|
||||
Secrets: defaultSecretConfig(),
|
||||
@@ -283,6 +284,7 @@ func defaultConfigFromMemory() (*EngineConfig, error) {
|
||||
c.VolumePath = filepath.Join(storeOpts.GraphRoot, "volumes")
|
||||
|
||||
c.VolumePluginTimeout = DefaultVolumePluginTimeout
|
||||
c.CompressionFormat = "gzip"
|
||||
|
||||
c.HelperBinariesDir = defaultHelperBinariesDir
|
||||
if additionalHelperBinariesDir != "" {
|
||||
|
||||
Reference in New Issue
Block a user