From 9335cf9d29ae57b027dc750c53705314d9e286d5 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 (cherry picked from commit 7fa601adc7858606630dec5b037e60b8955e716d) --- daemon/container_unix.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/daemon/container_unix.go b/daemon/container_unix.go index 054541b54..8948e90a8 100644 --- a/daemon/container_unix.go +++ b/daemon/container_unix.go @@ -713,7 +713,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() }