mirror of
https://github.com/containers/podman.git
synced 2025-08-06 11:32:07 +08:00
vendor c/common@0ededd18a1
Update the login tests to reflect the latest changes to allow http{s} prefixes (again) to address bugzilla.redhat.com/show_bug.cgi?id=2062072. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
This commit is contained in:
11
vendor/github.com/containers/common/libnetwork/netavark/run.go
generated
vendored
11
vendor/github.com/containers/common/libnetwork/netavark/run.go
generated
vendored
@ -1,3 +1,4 @@
|
||||
//go:build linux
|
||||
// +build linux
|
||||
|
||||
package netavark
|
||||
@ -44,6 +45,16 @@ func (n *netavarkNetwork) Setup(namespacePath string, options types.SetupOptions
|
||||
return nil, errors.Wrap(err, "failed to convert net opts")
|
||||
}
|
||||
|
||||
// Warn users if one or more networks have dns enabled
|
||||
// but aardvark-dns binary is not configured
|
||||
for _, network := range netavarkOpts.Networks {
|
||||
if network != nil && network.DNSEnabled && n.aardvarkBinary == "" {
|
||||
// this is not a fatal error we can still use container without dns
|
||||
logrus.Warnf("aardvark-dns binary not found, container dns will not be enabled")
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// trace output to get the json
|
||||
if logrus.IsLevelEnabled(logrus.TraceLevel) {
|
||||
b, err := json.Marshal(&netavarkOpts)
|
||||
|
Reference in New Issue
Block a user