kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #25564 from coolljt0725/fix_inspect_network

Browse source 
Fix inspect network show gateway with mask
This commit is contained in:
Sebastiaan van Stijn 2016-08-12 11:11:09 +02:00 committed by GitHub
commit d8240c8e27
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/server/router/network/network_routes.go
View file

@ -240,7 +240,7 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo)
for _, ip4Info := range ipv4Info { for _, ip4Info := range ipv4Info {
iData := network.IPAMConfig{} iData := network.IPAMConfig{}
iData.Subnet = ip4Info.IPAMData.Pool.String() 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) r.IPAM.Config = append(r.IPAM.Config, iData)
} }
} }

2
docs/reference/api/docker_remote_api_v1.24.md
View file

@ -3175,7 +3175,7 @@ Content-Type: application/json
"Config": [ "Config": [
{ {
"Subnet": "172.19.0.0/16", "Subnet": "172.19.0.0/16",
"Gateway": "172.19.0.1/16" "Gateway": "172.19.0.1"
} }
], ],
"Options": { "Options": {

2
docs/reference/api/docker_remote_api_v1.25.md
View file

@ -3183,7 +3183,7 @@ Content-Type: application/json
"Config": [ "Config": [
{ {
"Subnet": "172.19.0.0/16", "Subnet": "172.19.0.0/16",
"Gateway": "172.19.0.1/16" "Gateway": "172.19.0.1"
} }
], ],
"Options": { "Options": {

2
docs/reference/commandline/network_inspect.md
View file

@ -102,7 +102,7 @@ $ docker network inspect simple-network
"Config": [ "Config": [
{ {
"Subnet": "172.22.0.0/16", "Subnet": "172.22.0.0/16",
"Gateway": "172.22.0.1/16" "Gateway": "172.22.0.1"
} }
] ]
}, },

2
docs/tutorials/networkingcontainers.md
View file

@ -183,7 +183,7 @@ If you inspect the network, you'll find that it has nothing in it.
"Config": [ "Config": [
{ {
"Subnet": "172.18.0.0/16", "Subnet": "172.18.0.0/16",
"Gateway": "172.18.0.1/16" "Gateway": "172.18.0.1"
} }
] ]
}, },

2
docs/userguide/networking/dockernetworks.md
View file

@ -333,7 +333,7 @@ $ docker network inspect isolated_nw
"Config": [ "Config": [
{ {
"Subnet": "172.21.0.0/16", "Subnet": "172.21.0.0/16",
"Gateway": "172.21.0.1/16" "Gateway": "172.21.0.1"
} }
] ]
}, },

10
docs/userguide/networking/work-with-networks.md
View file

@ -57,7 +57,7 @@ $ docker network inspect simple-network
"Config": [ "Config": [
{ {
"Subnet": "172.22.0.0/16", "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": [ "Config": [
{ {
"Subnet": "172.23.0.0/16", "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": [ "Config": [
{ {
"Subnet": "172.25.0.0/16", "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": [ "Config": [
{ {
"Subnet": "172.21.0.0/16", "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": [ "Config": [
{ {
"Subnet": "172.21.0.0/16", "Subnet": "172.21.0.0/16",
"Gateway": "172.21.0.1/16" "Gateway": "172.21.0.1"
} }
] ]
}, },

2
man/docker-network-inspect.1.md
View file

@ -91,7 +91,7 @@ $ docker network inspect simple-network
"Config": [ "Config": [
{ {
"Subnet": "172.22.0.0/16", "Subnet": "172.22.0.0/16",
"Gateway": "172.22.0.1/16" "Gateway": "172.22.0.1"
} }
] ]
}, },