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

Remove BridgeIP from ipallocation pool
moby · Jan 8, 2015 · c438900 · c438900
2 parents 11e4799 + f4551b8
commit c438900
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/daemon/networkdriver/bridge/driver.go b/daemon/networkdriver/bridge/driver.go
@@ -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)
 

diff --git a/daemon/networkdriver/ipallocator/allocator.go b/daemon/networkdriver/ipallocator/allocator.go
@@ -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
 }