From 28eb09ab06c64aa80cc4ed1d9f33156a6b12a115 Mon Sep 17 00:00:00 2001 From: David Calavera Date: Tue, 27 Oct 2015 19:54:37 -0400 Subject: [PATCH] Update inspect api examples with new network settings. Signed-off-by: David Calavera Upstream-commit: 9a7e632cf097b71aab6e46ef010d038f602e03d3 Component: engine --- .../reference/api/docker_remote_api_v1.21.md | 56 ++++++++++++++----- .../reference/api/docker_remote_api_v1.22.md | 56 ++++++++++++++----- 2 files changed, 86 insertions(+), 26 deletions(-) diff --git a/components/engine/docs/reference/api/docker_remote_api_v1.21.md b/components/engine/docs/reference/api/docker_remote_api_v1.21.md index c60b65823d..bb0339468b 100644 --- a/components/engine/docs/reference/api/docker_remote_api_v1.21.md +++ b/components/engine/docs/reference/api/docker_remote_api_v1.21.md @@ -437,11 +437,26 @@ Return low-level information on the container `id` "Name": "/boring_euclid", "NetworkSettings": { "Bridge": "", - "Gateway": "", - "IPAddress": "", - "IPPrefixLen": 0, - "MacAddress": "", - "Ports": null + "SandboxID": "", + "HairpinMode": false, + "LinkLocalIPv6Address": "", + "LinkLocalIPv6PrefixLen": 0, + "SandboxKey": "", + "SecondaryIPAddresses": [], + "SecondaryIPv6Addresses": [], + "Ports": null, + "Networks": { + "bridge": { + "EndpointID": "", + "Gateway": "", + "IPAdress": "", + "IPPrefixLen": 0, + "IPv6Gateway": "", + "GlobalIPv6Address": "", + "GlobalIPv6PrefixLen": 0, + "MacAddress": "" + } + } }, "Path": "/bin/sh", "ProcessLabel": "", @@ -2369,14 +2384,29 @@ Return low-level information about the `exec` command `id`. "SecurityOpt" : null }, "Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5", - "NetworkSettings" : { - "IPAddress" : "172.17.0.2", - "IPPrefixLen" : 16, - "MacAddress" : "02:42:ac:11:00:02", - "Gateway" : "172.17.42.1", - "Bridge" : "docker0", - "Ports" : {} - }, + "NetworkSettings": { + "Bridge": "", + "SandboxID": "", + "HairpinMode": false, + "LinkLocalIPv6Address": "", + "LinkLocalIPv6PrefixLen": 0, + "SandboxKey": "", + "SecondaryIPAddresses": [], + "SecondaryIPv6Addresses": [], + "Ports": null, + "Networks": { + "bridge": { + "EndpointID": "", + "Gateway": "", + "IPAdress": "", + "IPPrefixLen": 0, + "IPv6Gateway": "", + "GlobalIPv6Address": "", + "GlobalIPv6PrefixLen": 0, + "MacAddress": "" + } + } + }, "ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf", "HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname", "HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts", diff --git a/components/engine/docs/reference/api/docker_remote_api_v1.22.md b/components/engine/docs/reference/api/docker_remote_api_v1.22.md index de1666641f..c49009755f 100644 --- a/components/engine/docs/reference/api/docker_remote_api_v1.22.md +++ b/components/engine/docs/reference/api/docker_remote_api_v1.22.md @@ -435,11 +435,26 @@ Return low-level information on the container `id` "Name": "/boring_euclid", "NetworkSettings": { "Bridge": "", - "Gateway": "", - "IPAddress": "", - "IPPrefixLen": 0, - "MacAddress": "", - "Ports": null + "SandboxID": "", + "HairpinMode": false, + "LinkLocalIPv6Address": "", + "LinkLocalIPv6PrefixLen": 0, + "SandboxKey": "", + "SecondaryIPAddresses": [], + "SecondaryIPv6Addresses": [], + "Ports": null, + "Networks": { + "bridge": { + "EndpointID": "", + "Gateway": "", + "IPAdress": "", + "IPPrefixLen": 0, + "IPv6Gateway": "", + "GlobalIPv6Address": "", + "GlobalIPv6PrefixLen": 0, + "MacAddress": "" + } + } }, "Path": "/bin/sh", "ProcessLabel": "", @@ -2364,14 +2379,29 @@ Return low-level information about the `exec` command `id`. "SecurityOpt" : null }, "Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5", - "NetworkSettings" : { - "IPAddress" : "172.17.0.2", - "IPPrefixLen" : 16, - "MacAddress" : "02:42:ac:11:00:02", - "Gateway" : "172.17.42.1", - "Bridge" : "docker0", - "Ports" : {} - }, + "NetworkSettings": { + "Bridge": "", + "SandboxID": "", + "HairpinMode": false, + "LinkLocalIPv6Address": "", + "LinkLocalIPv6PrefixLen": 0, + "SandboxKey": "", + "SecondaryIPAddresses": [], + "SecondaryIPv6Addresses": [], + "Ports": null, + "Networks": { + "bridge": { + "EndpointID": "", + "Gateway": "", + "IPAdress": "", + "IPPrefixLen": 0, + "IPv6Gateway": "", + "GlobalIPv6Address": "", + "GlobalIPv6PrefixLen": 0, + "MacAddress": "" + } + } + }, "ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf", "HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname", "HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts",