docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9975 from MalteJ/dont-allocate-bridgeip 

Remove BridgeIP from ipallocation pool
This commit is contained in:
Jessie Frazelle 2015-01-08 10:27:17 -08:00
parent 11e47996dc f4551b8a48
commit c438900827
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/networkdriver/bridge/driver.go
View File

@ -171,6 +171,9 @@ func InitDriver(job *engine.Job) engine.Status {
} }
} }
// Block BridgeIP in IP allocator
ipallocator.RequestIP(bridgeNetwork, bridgeNetwork.IP)
// https://github.com/docker/docker/issues/2768 // https://github.com/docker/docker/issues/2768
job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", bridgeNetwork.IP) job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", bridgeNetwork.IP)

1
daemon/networkdriver/ipallocator/allocator.go
View File

@ -121,7 +121,6 @@ func (allocated *allocatedMap) checkIP(ip net.IP) (net.IP, error) {
// Register the IP. // Register the IP.
allocated.p[ip.String()] = struct{}{} allocated.p[ip.String()] = struct{}{}
allocated.last.Set(pos)
return ip, nil return ip, nil
} }