Browse code

Add missing fields for NetworkSettings

Dump from 1.10.1 has this fields.

Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com>

Close and carry #20377
Include David's request

Signed-off-by: Mary Anthony <mary@docker.com>

Kanstantsin Shautsou authored on 2016/02/17 09:47:03
Showing 2 changed files
... ...
@@ -58,9 +58,15 @@ List containers
58 58
                  },
59 59
                  "SizeRw": 12288,
60 60
                  "SizeRootFs": 0,
61
+                 "HostConfig": {
62
+                         "NetworkMode": "default"
63
+                 },
61 64
                  "NetworkSettings": {
62 65
                          "Networks": {
63 66
                                  "bridge": {
67
+                                          "IPAMConfig": null,
68
+                                          "Links": null,
69
+                                          "Aliases": null,
64 70
                                           "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
65 71
                                           "EndpointID": "2cdc4edb1ded3631c81f57966563e5c8525b81121bb3706a9a9a3ae102711f3f",
66 72
                                           "Gateway": "172.17.0.1",
... ...
@@ -86,9 +92,15 @@ List containers
86 86
                  "Labels": {},
87 87
                  "SizeRw": 12288,
88 88
                  "SizeRootFs": 0,
89
+                 "HostConfig": {
90
+                         "NetworkMode": "default"
91
+                 },
89 92
                  "NetworkSettings": {
90 93
                          "Networks": {
91 94
                                  "bridge": {
95
+                                          "IPAMConfig": null,
96
+                                          "Links": null,
97
+                                          "Aliases": null,
92 98
                                           "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
93 99
                                           "EndpointID": "88eaed7b37b38c2a3f0c4bc796494fdf51b270c2d22656412a2ca5d559a64d7a",
94 100
                                           "Gateway": "172.17.0.1",
... ...
@@ -115,9 +127,15 @@ List containers
115 115
                  "Labels": {},
116 116
                  "SizeRw":12288,
117 117
                  "SizeRootFs":0,
118
+                 "HostConfig": {
119
+                         "NetworkMode": "default"
120
+                 },
118 121
                  "NetworkSettings": {
119 122
                          "Networks": {
120 123
                                  "bridge": {
124
+                                          "IPAMConfig": null,
125
+                                          "Links": null,
126
+                                          "Aliases": null,
121 127
                                           "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
122 128
                                           "EndpointID": "8b27c041c30326d59cd6e6f510d4f8d1d570a228466f956edf7815508f78e30d",
123 129
                                           "Gateway": "172.17.0.1",
... ...
@@ -144,9 +162,15 @@ List containers
144 144
                  "Labels": {},
145 145
                  "SizeRw": 12288,
146 146
                  "SizeRootFs": 0,
147
+                 "HostConfig": {
148
+                         "NetworkMode": "default"
149
+                 },
147 150
                  "NetworkSettings": {
148 151
                          "Networks": {
149 152
                                  "bridge": {
153
+                                          "IPAMConfig": null,
154
+                                          "Links": null,
155
+                                          "Aliases": null,
150 156
                                           "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
151 157
                                           "EndpointID": "d91c7b2f0644403d7ef3095985ea0e2370325cd2332ff3a3225c4247328e66e9",
152 158
                                           "Gateway": "172.17.0.1",
... ...
@@ -59,9 +59,15 @@ List containers
59 59
                  },
60 60
                  "SizeRw": 12288,
61 61
                  "SizeRootFs": 0,
62
+                 "HostConfig": {
63
+                         "NetworkMode": "default"
64
+                 },
62 65
                  "NetworkSettings": {
63 66
                          "Networks": {
64 67
                                  "bridge": {
68
+                                          "IPAMConfig": null,
69
+                                          "Links": null,
70
+                                          "Aliases": null,
65 71
                                           "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
66 72
                                           "EndpointID": "2cdc4edb1ded3631c81f57966563e5c8525b81121bb3706a9a9a3ae102711f3f",
67 73
                                           "Gateway": "172.17.0.1",
... ...
@@ -99,9 +105,15 @@ List containers
99 99
                  "Labels": {},
100 100
                  "SizeRw": 12288,
101 101
                  "SizeRootFs": 0,
102
+                 "HostConfig": {
103
+                         "NetworkMode": "default"
104
+                 },
102 105
                  "NetworkSettings": {
103 106
                          "Networks": {
104 107
                                  "bridge": {
108
+                                          "IPAMConfig": null,
109
+                                          "Links": null,
110
+                                          "Aliases": null,
105 111
                                           "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
106 112
                                           "EndpointID": "88eaed7b37b38c2a3f0c4bc796494fdf51b270c2d22656412a2ca5d559a64d7a",
107 113
                                           "Gateway": "172.17.0.1",
... ...
@@ -129,9 +141,15 @@ List containers
129 129
                  "Labels": {},
130 130
                  "SizeRw":12288,
131 131
                  "SizeRootFs":0,
132
+                 "HostConfig": {
133
+                         "NetworkMode": "default"
134
+                 },
132 135
                  "NetworkSettings": {
133 136
                          "Networks": {
134 137
                                  "bridge": {
138
+                                          "IPAMConfig": null,
139
+                                          "Links": null,
140
+                                          "Aliases": null,
135 141
                                           "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
136 142
                                           "EndpointID": "8b27c041c30326d59cd6e6f510d4f8d1d570a228466f956edf7815508f78e30d",
137 143
                                           "Gateway": "172.17.0.1",
... ...
@@ -159,9 +177,15 @@ List containers
159 159
                  "Labels": {},
160 160
                  "SizeRw": 12288,
161 161
                  "SizeRootFs": 0,
162
+                 "HostConfig": {
163
+                         "NetworkMode": "default"
164
+                 },
162 165
                  "NetworkSettings": {
163 166
                          "Networks": {
164 167
                                  "bridge": {
168
+                                          "IPAMConfig": null,
169
+                                          "Links": null,
170
+                                          "Aliases": null,
165 171
                                           "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
166 172
                                           "EndpointID": "d91c7b2f0644403d7ef3095985ea0e2370325cd2332ff3a3225c4247328e66e9",
167 173
                                           "Gateway": "172.17.0.1",