GitList

Browse code

Remove BridgeIP from ipallocation pool

Closes #9938

Signed-off-by: Malte Janduda <mail@janduda.net>

Malte Janduda authored on 2015/01/09 00:21:01
Showing 2 changed files

daemon/networkdriver/bridge/driver.go index 81624ad..2f94f05 100644
daemon/networkdriver/ipallocator/allocator.go index a8625c0..40c3eb8 100644

@@ -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)
 

daemon/networkdriver/ipallocator/allocator.go

History View file @ f4551b8

@@ -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
+                     }

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