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

Merge pull request #4871 from crosbymichael/bip-exists 

Return error when existing bridge does not match ip
This commit is contained in:
Guillaume J. Charmes 2014-03-27 14:51:21 -07:00
parent be5c65c2a2 baba9cde95
commit d848e2d113
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/networkdriver/bridge/driver.go
View File

@ -93,6 +93,12 @@ func InitDriver(job *engine.Job) engine.Status {
network = addr.(*net.IPNet) network = addr.(*net.IPNet)
} else { } else {
network = addr.(*net.IPNet) network = addr.(*net.IPNet)
// validate that the bridge ip matches the ip specified by BridgeIP
if bridgeIP != "" {
if !network.IP.Equal(net.ParseIP(bridgeIP)) {
return job.Errorf("bridge ip (%s) does not match existing bridge configuration %s", network.IP, bridgeIP)
}
}
} }
// Configure iptables for link support // Configure iptables for link support