From 60cb5f1a34147250a46b623964f88823a40a0280 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Tue, 19 Nov 2013 09:41:10 -0500 Subject: [PATCH 1/2] 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 --- server.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server.go b/server.go index 79ead96a62..f9bd8844e7 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() } From ef14aaf627377b24edb55fe2080e10f748c0e444 Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Fri, 22 Nov 2013 14:28:49 -0500 Subject: [PATCH 2/2] fix the nil pointer panic on closing a disabled network manager Issue #2768 --- network.go | 3 +++ 1 file changed, 3 insertions(+) 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()