浏览代码

Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value

Fix docker inspect display odd gateway value for none network mode
David Calavera 9 年之前
父节点
当前提交
54d42f4a10
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      daemon/container_unix.go

+ 3 - 1
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()
 	}