From 096bb5fb0740656b91b3e35f8df23c79270f7f90 Mon Sep 17 00:00:00 2001 From: Lei Jitang Date: Thu, 11 Aug 2016 21:08:54 -0400 Subject: [PATCH] Fix inspect network show gateway with mask Signed-off-by: Lei Jitang --- api/server/router/network/network_routes.go | 2 +- docs/reference/api/docker_remote_api_v1.24.md | 2 +- docs/reference/api/docker_remote_api_v1.25.md | 2 +- docs/reference/commandline/network_inspect.md | 2 +- docs/tutorials/networkingcontainers.md | 2 +- docs/userguide/networking/dockernetworks.md | 2 +- docs/userguide/networking/work-with-networks.md | 10 +++++----- man/docker-network-inspect.1.md | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go index 0e6de39ef8..6e491cd97e 100644 --- a/api/server/router/network/network_routes.go +++ b/api/server/router/network/network_routes.go @@ -240,7 +240,7 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo) for _, ip4Info := range ipv4Info { iData := network.IPAMConfig{} iData.Subnet = ip4Info.IPAMData.Pool.String() - iData.Gateway = ip4Info.IPAMData.Gateway.String() + iData.Gateway = ip4Info.IPAMData.Gateway.IP.String() r.IPAM.Config = append(r.IPAM.Config, iData) } } diff --git a/docs/reference/api/docker_remote_api_v1.24.md b/docs/reference/api/docker_remote_api_v1.24.md index 514fdb167d..b80a47e934 100644 --- a/docs/reference/api/docker_remote_api_v1.24.md +++ b/docs/reference/api/docker_remote_api_v1.24.md @@ -3115,7 +3115,7 @@ Content-Type: application/json "Config": [ { "Subnet": "172.19.0.0/16", - "Gateway": "172.19.0.1/16" + "Gateway": "172.19.0.1" } ], "Options": { diff --git a/docs/reference/api/docker_remote_api_v1.25.md b/docs/reference/api/docker_remote_api_v1.25.md index f5f3507fe7..0575346a49 100644 --- a/docs/reference/api/docker_remote_api_v1.25.md +++ b/docs/reference/api/docker_remote_api_v1.25.md @@ -3115,7 +3115,7 @@ Content-Type: application/json "Config": [ { "Subnet": "172.19.0.0/16", - "Gateway": "172.19.0.1/16" + "Gateway": "172.19.0.1" } ], "Options": { diff --git a/docs/reference/commandline/network_inspect.md b/docs/reference/commandline/network_inspect.md index e72a5c793f..e2e3dc7833 100644 --- a/docs/reference/commandline/network_inspect.md +++ b/docs/reference/commandline/network_inspect.md @@ -102,7 +102,7 @@ $ docker network inspect simple-network "Config": [ { "Subnet": "172.22.0.0/16", - "Gateway": "172.22.0.1/16" + "Gateway": "172.22.0.1" } ] }, diff --git a/docs/tutorials/networkingcontainers.md b/docs/tutorials/networkingcontainers.md index 591c90098d..9a3c4486c4 100644 --- a/docs/tutorials/networkingcontainers.md +++ b/docs/tutorials/networkingcontainers.md @@ -183,7 +183,7 @@ If you inspect the network, you'll find that it has nothing in it. "Config": [ { "Subnet": "172.18.0.0/16", - "Gateway": "172.18.0.1/16" + "Gateway": "172.18.0.1" } ] }, diff --git a/docs/userguide/networking/dockernetworks.md b/docs/userguide/networking/dockernetworks.md index a3a3bd6eba..511680a19a 100644 --- a/docs/userguide/networking/dockernetworks.md +++ b/docs/userguide/networking/dockernetworks.md @@ -333,7 +333,7 @@ $ docker network inspect isolated_nw "Config": [ { "Subnet": "172.21.0.0/16", - "Gateway": "172.21.0.1/16" + "Gateway": "172.21.0.1" } ] }, diff --git a/docs/userguide/networking/work-with-networks.md b/docs/userguide/networking/work-with-networks.md index c142383d4d..bc22f66f26 100644 --- a/docs/userguide/networking/work-with-networks.md +++ b/docs/userguide/networking/work-with-networks.md @@ -57,7 +57,7 @@ $ docker network inspect simple-network "Config": [ { "Subnet": "172.22.0.0/16", - "Gateway": "172.22.0.1/16" + "Gateway": "172.22.0.1" } ] }, @@ -153,7 +153,7 @@ $ docker network inspect my-network "Config": [ { "Subnet": "172.23.0.0/16", - "Gateway": "172.23.0.1/16" + "Gateway": "172.23.0.1" } ] }, @@ -223,7 +223,7 @@ $ docker network inspect isolated_nw "Config": [ { "Subnet": "172.25.0.0/16", - "Gateway": "172.25.0.1/16" + "Gateway": "172.25.0.1" } ] }, @@ -784,7 +784,7 @@ $ docker network inspect isolated_nw "Config": [ { "Subnet": "172.21.0.0/16", - "Gateway": "172.21.0.1/16" + "Gateway": "172.21.0.1" } ] }, @@ -895,7 +895,7 @@ docker network inspect isolated_nw "Config": [ { "Subnet": "172.21.0.0/16", - "Gateway": "172.21.0.1/16" + "Gateway": "172.21.0.1" } ] }, diff --git a/man/docker-network-inspect.1.md b/man/docker-network-inspect.1.md index da4e7c3550..3805fb25a8 100644 --- a/man/docker-network-inspect.1.md +++ b/man/docker-network-inspect.1.md @@ -91,7 +91,7 @@ $ docker network inspect simple-network "Config": [ { "Subnet": "172.22.0.0/16", - "Gateway": "172.22.0.1/16" + "Gateway": "172.22.0.1" } ] },