0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request from thaJeztah/libnetwork_bridge_error

Browse source 
libnetwork/drivers/bridge: setupBridgeNetFiltering: improve error handling
This commit is contained in:
Sebastiaan van Stijn 2023-07-17 16:23:49 +02:00 • committed by GitHub
commit ba513805d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions

17
libnetwork/drivers/bridge/setup_bridgenetfiltering.go
View file

@ -33,18 +33,15 @@ func getIPVersion(config *networkConfiguration) ipVersion {
func setupBridgeNetFiltering(config *networkConfiguration, _ *bridgeInterface) error {
if err := checkBridgeNetFiltering(config); err != nil {
if ptherr, ok := err.(*os.PathError); ok {
if errno, ok := ptherr.Err.(syscall.Errno); ok && errno == syscall.ENOENT {
if isRunningInContainer() {
log.G(context.TODO()).Warnf("running inside docker container, ignoring missing kernel params: %v", err)
return nil
}
err = errors.New("please ensure that br_netfilter kernel module is loaded")
var pathErr *os.PathError
if errors.As(err, &pathErr) && errors.Is(pathErr, syscall.ENOENT) {
if isRunningInContainer() {
log.G(context.TODO()).WithError(err).Warnf("running inside docker container, ignoring missing kernel params")
return nil
}
err = errors.New("ensure that the br_netfilter kernel module is loaded")
}
if err != nil {
return fmt.Errorf("cannot restrict inter-container communication: %v", err)
}
return fmt.Errorf("cannot restrict inter-container communication: %v", err)
}
return nil
}