do not setup bridge ip if bridgeNetwork is nil. This is the case when
-b='none' bridge is provided. issue #2768 https://bugzilla.redhat.com/show_bug.cgi?id=1032094 Upstream-commit: 60cb5f1a34147250a46b623964f88823a40a0280 Component: engine
This commit is contained in:
@ -63,7 +63,10 @@ func jobInitApi(job *engine.Job) string {
|
||||
}()
|
||||
job.Eng.Hack_SetGlobalVar("httpapi.server", srv)
|
||||
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 {
|
||||
return err.Error()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user