rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-10 11:11:31 +00:00
Code Issues Releases Wiki Activity

Bump a few libs to latest tagged versions

Browse Source
This commit is contained in:
Ivan Mikushin
2016-02-04 22:40:30 -08:00
parent 3a0aebe738
commit caeacfa6ed
137 changed files with 4898 additions and 8553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vendor/github.com/docker/libnetwork/default_gateway.go generated vendored
View File

@@ -87,7 +87,7 @@ func (sb *sandbox) clearDefaultGW() error {
if err := ep.sbLeave(sb); err != nil {
return fmt.Errorf("container %s: endpoint leaving GW Network failed: %v", sb.containerID, err)
}
if err := ep.Delete(); err != nil {
if err := ep.Delete(false); err != nil {
return fmt.Errorf("container %s: deleting endpoint on GW Network failed: %v", sb.containerID, err)
}
return nil
@@ -103,10 +103,21 @@ func (sb *sandbox) needDefaultGW() bool {
if ep.getNetwork().Type() == "null" || ep.getNetwork().Type() == "host" {
continue
}
if ep.getNetwork().Internal() {
return false
}
if ep.joinInfo.disableGatewayService {
return false
}
// TODO v6 needs to be handled.
if len(ep.Gateway()) > 0 {
return false
}
for _, r := range ep.StaticRoutes() {
if r.Destination.String() == "0.0.0.0/0" {
return false
}
}
needGW = true
}
return needGW