mirror of
https://github.com/containers/podman.git
synced 2025-11-13 09:38:05 +08:00
Bump Buildah to v1.24.0
Bumps Buildah to v1.24.0 and adopts the new values for pull: true, false, never, and always. The pull-never and pull-always options for the build command are still usable, but they have been removed from the man page documentation with this change. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
14
vendor/github.com/containers/common/libnetwork/network/interface.go
generated
vendored
14
vendor/github.com/containers/common/libnetwork/network/interface.go
generated
vendored
@@ -31,6 +31,11 @@ const (
|
||||
netavarkConfigDir = "/etc/containers/networks"
|
||||
// netavarkRunDir is the run directory for the rootful temporary network files such as the ipam db
|
||||
netavarkRunDir = "/run/containers/networks"
|
||||
|
||||
// netavarkBinary is the name of the netavark binary
|
||||
netavarkBinary = "netavark"
|
||||
// aardvarkBinary is the name of the aardvark binary
|
||||
aardvarkBinary = "aardvark-dns"
|
||||
)
|
||||
|
||||
// NetworkBackend returns the network backend name and interface
|
||||
@@ -51,11 +56,17 @@ func NetworkBackend(store storage.Store, conf *config.Config, syslog bool) (type
|
||||
|
||||
switch backend {
|
||||
case types.Netavark:
|
||||
netavarkBin, err := conf.FindHelperBinary("netavark", false)
|
||||
netavarkBin, err := conf.FindHelperBinary(netavarkBinary, false)
|
||||
if err != nil {
|
||||
return "", nil, err
|
||||
}
|
||||
|
||||
aardvarkBin, err := conf.FindHelperBinary(aardvarkBinary, false)
|
||||
if err != nil {
|
||||
// this is not a fatal error we can still use netavark without dns
|
||||
logrus.Warnf("%s binary not found, container dns will not be enabled", aardvarkBin)
|
||||
}
|
||||
|
||||
confDir := conf.Network.NetworkConfigDir
|
||||
if confDir == "" {
|
||||
confDir = getDefaultNetavarkConfigDir(store)
|
||||
@@ -74,6 +85,7 @@ func NetworkBackend(store storage.Store, conf *config.Config, syslog bool) (type
|
||||
NetworkConfigDir: confDir,
|
||||
NetworkRunDir: runDir,
|
||||
NetavarkBinary: netavarkBin,
|
||||
AardvarkBinary: aardvarkBin,
|
||||
DefaultNetwork: conf.Network.DefaultNetwork,
|
||||
DefaultSubnet: conf.Network.DefaultSubnet,
|
||||
Syslog: syslog,
|
||||
|
||||
Reference in New Issue
Block a user