diff --git a/network.go b/network.go index 3864cca8cd..1397de0557 100644 --- a/network.go +++ b/network.go @@ -661,6 +661,9 @@ func (manager *NetworkManager) Allocate() (*NetworkInterface, error) { } func (manager *NetworkManager) Close() error { + if manager.disabled { + return nil + } err1 := manager.tcpPortAllocator.Close() err2 := manager.udpPortAllocator.Close() err3 := manager.ipAllocator.Close() diff --git a/server.go b/server.go index a65a839428..db1dce74d7 100644 --- a/server.go +++ b/server.go @@ -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() }