kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove BridgeIP from ipallocation pool

Browse source 
Closes #9938

Signed-off-by: Malte Janduda <mail@janduda.net>
This commit is contained in:
Malte Janduda 2015-01-08 16:21:01 +01:00
parent 11e47996dc
commit f4551b8a48
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
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.
allocated.p[ip.String()] = struct{}{}
allocated.last.Set(pos)
return ip, nil
}