mirror of
https://github.com/containers/podman.git
synced 2025-10-16 18:53:19 +08:00
Bump github.com/containers/common from 0.16.0 to 0.17.0
Bumps [github.com/containers/common](https://github.com/containers/common) from 0.16.0 to 0.17.0. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.16.0...v0.17.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
344a791ac2
commit
ca049ef6f9
9
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
9
vendor/github.com/containers/common/pkg/config/default.go
generated
vendored
@ -92,8 +92,10 @@ const (
|
||||
// InstallPrefix is the prefix where podman will be installed.
|
||||
// It can be overridden at build time.
|
||||
_installPrefix = "/usr"
|
||||
// _cniConfigDir is the directory where cni plugins are found
|
||||
// _cniConfigDir is the directory where cni configuration is found
|
||||
_cniConfigDir = "/etc/cni/net.d/"
|
||||
// _cniConfigDirRootless is the directory where cni plugins are found
|
||||
_cniConfigDirRootless = ".config/cni/net.d/"
|
||||
// CgroupfsCgroupsManager represents cgroupfs native cgroup manager
|
||||
CgroupfsCgroupsManager = "cgroupfs"
|
||||
// DefaultApparmorProfile specifies the default apparmor profile for the container.
|
||||
@ -138,6 +140,8 @@ func DefaultConfig() (*Config, error) {
|
||||
|
||||
netns := "bridge"
|
||||
|
||||
cniConfig := _cniConfigDir
|
||||
|
||||
defaultEngineConfig.SignaturePolicyPath = DefaultSignaturePolicyPath
|
||||
if unshare.IsRootless() {
|
||||
home, err := unshare.HomeDir()
|
||||
@ -152,6 +156,7 @@ func DefaultConfig() (*Config, error) {
|
||||
}
|
||||
}
|
||||
netns = "slirp4netns"
|
||||
cniConfig = filepath.Join(home, _cniConfigDirRootless)
|
||||
}
|
||||
|
||||
cgroupNS := "host"
|
||||
@ -198,7 +203,7 @@ func DefaultConfig() (*Config, error) {
|
||||
},
|
||||
Network: NetworkConfig{
|
||||
DefaultNetwork: "podman",
|
||||
NetworkConfigDir: _cniConfigDir,
|
||||
NetworkConfigDir: cniConfig,
|
||||
CNIPluginDirs: cniBinDir,
|
||||
},
|
||||
Engine: *defaultEngineConfig,
|
||||
|
Reference in New Issue
Block a user