mirror of
https://github.com/containers/podman.git
synced 2025-12-01 10:38:05 +08:00
Update vendor containers/(common,storage,buildah,image)
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
5
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
5
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
@@ -170,6 +170,11 @@ func createMacvlan(network *types.Network) error {
|
||||
}
|
||||
}
|
||||
|
||||
// always turn dns off with macvlan, it is not implemented in netavark
|
||||
// and makes little sense to support with macvlan
|
||||
// see https://github.com/containers/netavark/pull/467
|
||||
network.DNSEnabled = false
|
||||
|
||||
// we already validated the drivers before so we just have to set the default here
|
||||
switch network.IPAMOptions[types.Driver] {
|
||||
case "":
|
||||
|
||||
2
vendor/github.com/containers/common/libnetwork/types/network.go
generated
vendored
2
vendor/github.com/containers/common/libnetwork/types/network.go
generated
vendored
@@ -54,7 +54,7 @@ type Network struct {
|
||||
// to public or other Networks.
|
||||
Internal bool `json:"internal"`
|
||||
// DNSEnabled is whether name resolution is active for container on
|
||||
// this Network.
|
||||
// this Network. Only supported with the bridge driver.
|
||||
DNSEnabled bool `json:"dns_enabled"`
|
||||
// Labels is a set of key-value labels that have been applied to the
|
||||
// Network.
|
||||
|
||||
Reference in New Issue
Block a user