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

Merge pull request #2769 from vbatts/none_bridge 

Do not setup bridge ip if 'none' bridge is provided
This commit is contained in:
Michael Crosby 2013-11-22 11:48:33 -08:00
parent ae8c589d35 ef14aaf627
commit d4c8fb9ee2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
network.go
View File

@ -661,6 +661,9 @@ func (manager *NetworkManager) Allocate() (*NetworkInterface, error) {
} }
func (manager *NetworkManager) Close() error { func (manager *NetworkManager) Close() error {
if manager.disabled {
return nil
}
err1 := manager.tcpPortAllocator.Close() err1 := manager.tcpPortAllocator.Close()
err2 := manager.udpPortAllocator.Close() err2 := manager.udpPortAllocator.Close()
err3 := manager.ipAllocator.Close() err3 := manager.ipAllocator.Close()

5
server.go
View File

@ -63,7 +63,10 @@ func jobInitApi(job *engine.Job) string {
}() }()
job.Eng.Hack_SetGlobalVar("httpapi.server", srv) job.Eng.Hack_SetGlobalVar("httpapi.server", srv)
job.Eng.Hack_SetGlobalVar("httpapi.runtime", srv.runtime) job.Eng.Hack_SetGlobalVar("httpapi.runtime", srv.runtime)
job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", srv.runtime.networkManager.bridgeNetwork.IP) // https://github.com/dotcloud/docker/issues/2768
if srv.runtime.networkManager.bridgeNetwork != nil {
job.Eng.Hack_SetGlobalVar("httpapi.bridgeIP", srv.runtime.networkManager.bridgeNetwork.IP)
}
if err := job.Eng.Register("create", srv.ContainerCreate); err != nil { if err := job.Eng.Register("create", srv.ContainerCreate); err != nil {
return err.Error() return err.Error()
} }