p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix docker inspect display odd gateway value for none network mode

Browse Source 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7fa601adc7858606630dec5b037e60b8955e716d
Component: engine
This commit is contained in:
Lei Jitang
2015-10-27 21:47:12 -04:00
parent 50ef9e9aba
commit 62616f762f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/engine/daemon/container_unix.go
View File

@ -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()
}