From 62616f762fc2fc47b252708ca9a696d202be8add Mon Sep 17 00:00:00 2001 From: Lei Jitang Date: Tue, 27 Oct 2015 21:47:12 -0400 Subject: [PATCH] Fix docker inspect display odd gateway value for none network mode Signed-off-by: Lei Jitang Upstream-commit: 7fa601adc7858606630dec5b037e60b8955e716d Component: engine --- components/engine/daemon/container_unix.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/engine/daemon/container_unix.go b/components/engine/daemon/container_unix.go index 5c48019ef5..fb6695cc3e 100644 --- a/components/engine/daemon/container_unix.go +++ b/components/engine/daemon/container_unix.go @@ -714,7 +714,9 @@ func (container *Container) updateJoinInfo(n libnetwork.Network, ep libnetwork.E // It is not an error to get an empty endpoint info return nil } - container.NetworkSettings.Networks[n.Name()].Gateway = epInfo.Gateway().String() + if epInfo.Gateway() != nil { + container.NetworkSettings.Networks[n.Name()].Gateway = epInfo.Gateway().String() + } if epInfo.GatewayIPv6().To16() != nil { container.NetworkSettings.Networks[n.Name()].IPv6Gateway = epInfo.GatewayIPv6().String() }