1. docker
  2. Commit d8240c8e27b625c6c2b7982e2473cce46e2a9ddc
Browse code

Merge pull request #25564 from coolljt0725/fix_inspect_network

Fix inspect network show gateway with mask

Sebastiaan van Stijn authored on 2016/08/12 18:11:09
Showing 8 changed files
api/server/router/network/network_routes.go
History View file @ d8240c8
... ... 
@@ -240,7 +240,7 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo)
240 240 
 		for _, ip4Info := range ipv4Info {
241 241 
 			iData := network.IPAMConfig{}
242 242 
 			iData.Subnet = ip4Info.IPAMData.Pool.String()
243 
-			iData.Gateway = ip4Info.IPAMData.Gateway.String()
243 
+			iData.Gateway = ip4Info.IPAMData.Gateway.IP.String()
244 244 
 			r.IPAM.Config = append(r.IPAM.Config, iData)
245 245 
 		}
246 246 
 	}
docs/reference/api/docker_remote_api_v1.24.md
History View file @ d8240c8
... ... 
@@ -3175,7 +3175,7 @@ Content-Type: application/json
3175 3175 
     "Config": [
3176 3176 
       {
3177 3177 
         "Subnet": "172.19.0.0/16",
3178 
-        "Gateway": "172.19.0.1/16"
3178 
+        "Gateway": "172.19.0.1"
3179 3179 
       }
3180 3180 
     ],
3181 3181 
     "Options": {
docs/reference/api/docker_remote_api_v1.25.md
History View file @ d8240c8
... ... 
@@ -3183,7 +3183,7 @@ Content-Type: application/json
3183 3183 
     "Config": [
3184 3184 
       {
3185 3185 
         "Subnet": "172.19.0.0/16",
3186 
-        "Gateway": "172.19.0.1/16"
3186 
+        "Gateway": "172.19.0.1"
3187 3187 
       }
3188 3188 
     ],
3189 3189 
     "Options": {
docs/reference/commandline/network_inspect.md
History View file @ d8240c8
... ... 
@@ -102,7 +102,7 @@ $ docker network inspect simple-network
102 102 
             "Config": [
103 103 
                 {
104 104 
                     "Subnet": "172.22.0.0/16",
105 
-                    "Gateway": "172.22.0.1/16"
105 
+                    "Gateway": "172.22.0.1"
106 106 
                 }
107 107 
             ]
108 108 
         },
docs/tutorials/networkingcontainers.md
History View file @ d8240c8
... ... 
@@ -183,7 +183,7 @@ If you inspect the network, you'll find that it has nothing in it.
183 183 
                 "Config": [
184 184 
                     {
185 185 
                         "Subnet": "172.18.0.0/16",
186 
-                        "Gateway": "172.18.0.1/16"
186 
+                        "Gateway": "172.18.0.1"
187 187 
                     }
188 188 
                 ]
189 189 
             },
docs/userguide/networking/dockernetworks.md
History View file @ d8240c8
... ... 
@@ -333,7 +333,7 @@ $ docker network inspect isolated_nw
333 333 
             "Config": [
334 334 
                 {
335 335 
                     "Subnet": "172.21.0.0/16",
336 
-                    "Gateway": "172.21.0.1/16"
336 
+                    "Gateway": "172.21.0.1"
337 337 
                 }
338 338 
             ]
339 339 
         },
docs/userguide/networking/work-with-networks.md
History View file @ d8240c8
... ... 
@@ -57,7 +57,7 @@ $ docker network inspect simple-network
57 57 
             "Config": [
58 58 
                 {
59 59 
                     "Subnet": "172.22.0.0/16",
60 
-                    "Gateway": "172.22.0.1/16"
60 
+                    "Gateway": "172.22.0.1"
61 61 
                 }
62 62 
             ]
63 63 
         },
... ... 
@@ -153,7 +153,7 @@ $ docker network inspect my-network
153 153 
             "Config": [
154 154 
                 {
155 155 
                     "Subnet": "172.23.0.0/16",
156 
-                    "Gateway": "172.23.0.1/16"
156 
+                    "Gateway": "172.23.0.1"
157 157 
                 }
158 158 
             ]
159 159 
         },
... ... 
@@ -223,7 +223,7 @@ $ docker network inspect isolated_nw
223 223 
             "Config": [
224 224 
                 {
225 225 
                     "Subnet": "172.25.0.0/16",
226 
-                    "Gateway": "172.25.0.1/16"
226 
+                    "Gateway": "172.25.0.1"
227 227 
                 }
228 228 
             ]
229 229 
         },
... ... 
@@ -784,7 +784,7 @@ $ docker network inspect isolated_nw
784 784 
             "Config": [
785 785 
                 {
786 786 
                     "Subnet": "172.21.0.0/16",
787 
-                    "Gateway": "172.21.0.1/16"
787 
+                    "Gateway": "172.21.0.1"
788 788 
                 }
789 789 
             ]
790 790 
         },
... ... 
@@ -895,7 +895,7 @@ docker network inspect isolated_nw
895 895 
             "Config": [
896 896 
                 {
897 897 
                     "Subnet": "172.21.0.0/16",
898 
-                    "Gateway": "172.21.0.1/16"
898 
+                    "Gateway": "172.21.0.1"
899 899 
                 }
900 900 
             ]
901 901 
         },
man/docker-network-inspect.1.md
History View file @ d8240c8
... ... 
@@ -91,7 +91,7 @@ $ docker network inspect simple-network
91 91 
             "Config": [
92 92 
                 {
93 93 
                     "Subnet": "172.22.0.0/16",
94 
-                    "Gateway": "172.22.0.1/16"
94 
+                    "Gateway": "172.22.0.1"
95 95 
                 }
96 96 
             ]
97 97 
         },