kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

vendor: docker/libnetwork 026aabaa659832804b01754aaadd2c0f420c68b6 (bump_19.03 branch) 

full diff: 153d0769a1...026aabaa65

- Fix 'failed to get network during CreateEndpoint'
- log error instead if disabling IPv6 router advertisement failed

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-06-17 15:51:11 +02:00
parent d5a82971a4
commit b4ca19a992
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/dockerfile/install/proxy.installer
View File

@ -3,7 +3,7 @@
# LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When # LIBNETWORK_COMMIT is used to build the docker-userland-proxy binary. When
# updating the binary version, consider updating github.com/docker/libnetwork # updating the binary version, consider updating github.com/docker/libnetwork
# in vendor.conf accordingly # in vendor.conf accordingly
: ${LIBNETWORK_COMMIT:=153d0769a1181bf591a9637fd487a541ec7db1e6} # bump_19.03 branch : ${LIBNETWORK_COMMIT:=026aabaa659832804b01754aaadd2c0f420c68b6} # bump_19.03 branch
install_proxy() { install_proxy() {
case "$1" in case "$1" in

2
vendor.conf
View File

@ -38,7 +38,7 @@ github.com/gofrs/flock 7f43ea2e6a643ad441fc12d0ecc0
# libnetwork # libnetwork
# When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly # When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
github.com/docker/libnetwork 153d0769a1181bf591a9637fd487a541ec7db1e6 # bump_19.03 branch github.com/docker/libnetwork 026aabaa659832804b01754aaadd2c0f420c68b6 # bump_19.03 branch
github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f github.com/docker/go-events e31b211e4f1cd09aa76fe4ac244571fab96ae47f
github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

2
vendor/github.com/docker/libnetwork/drivers/bridge/setup_device.go generated vendored
View File

@ -63,7 +63,7 @@ func setupDefaultSysctl(config *networkConfiguration, i *bridgeInterface) error
return nil return nil
} }
if err := ioutil.WriteFile(sysPath, []byte{'0', '\n'}, 0644); err != nil { if err := ioutil.WriteFile(sysPath, []byte{'0', '\n'}, 0644); err != nil {
return fmt.Errorf("libnetwork: Unable to disable IPv6 router advertisement: %v", err) logrus.WithError(err).Warn("unable to disable IPv6 router advertisement")
} }
return nil return nil
} }

3
vendor/github.com/docker/libnetwork/network.go generated vendored
View File

@ -1181,7 +1181,8 @@ func (n *network) createEndpoint(name string, options ...EndpointOption) (Endpoi
ep.locator = n.getController().clusterHostID() ep.locator = n.getController().clusterHostID()
ep.network, err = ep.getNetworkFromStore() ep.network, err = ep.getNetworkFromStore()
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to get network during CreateEndpoint: %v", err) logrus.Errorf("failed to get network during CreateEndpoint: %v", err)
return nil, err
} }
n = ep.network n = ep.network

3
vendor/github.com/docker/libnetwork/store.go generated vendored
View File

@ -103,8 +103,7 @@ func (c *controller) getNetworkFromStore(nid string) (*network, error) {
} }
return n, nil return n, nil
} }
return nil, ErrNoSuchNetwork(nid)
return nil, fmt.Errorf("network %s not found", nid)
} }
func (c *controller) getNetworksForScope(scope string) ([]*network, error) { func (c *controller) getNetworksForScope(scope string) ([]*network, error) {