mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Fixed some differences between API and Docs in v1.22,v1.23,v1.24
Signed-off-by: Robin Naundorf <r.naundorf@fh-muenster.de>
This commit is contained in:
Robin Naundorf
parent
71cab5b0dc
commit
370dbe0cd9
3 changed files with 66 additions and 318 deletions
|
|
@ -2547,7 +2547,7 @@ Sets up an exec instance in a running container `id`
|
||||||
|
|
||||||
**Example response**:
|
**Example response**:
|
||||||
|
|
||||||
HTTP/1.1 201 OK
|
HTTP/1.1 201 Created
|
||||||
Content-Type: application/json
|
Content-Type: application/json
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
@ -2594,8 +2594,8 @@ interactive session with the `exec` command.
|
||||||
|
|
||||||
**Example response**:
|
**Example response**:
|
||||||
|
|
||||||
HTTP/1.1 201 OK
|
HTTP/1.1 200 OK
|
||||||
Content-Type: application/json
|
Content-Type: application/vnd.docker.raw-stream
|
||||||
|
|
||||||
{{ STREAM }}
|
{{ STREAM }}
|
||||||
|
|
||||||
|
|
@ -2653,112 +2653,28 @@ Return low-level information about the `exec` command `id`.
|
||||||
**Example response**:
|
**Example response**:
|
||||||
|
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Content-Type: plain/text
|
Content-Type: application/json
|
||||||
|
|
||||||
{
|
{
|
||||||
"ID" : "11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39",
|
"CanRemove": false,
|
||||||
"Running" : false,
|
"ContainerID": "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126",
|
||||||
"ExitCode" : 2,
|
"DetachKeys": "",
|
||||||
"ProcessConfig" : {
|
"ExitCode": 2,
|
||||||
"privileged" : false,
|
"ID": "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b",
|
||||||
"user" : "",
|
"OpenStderr": true,
|
||||||
"tty" : false,
|
"OpenStdin": true,
|
||||||
"entrypoint" : "sh",
|
"OpenStdout": true,
|
||||||
"arguments" : [
|
"ProcessConfig": {
|
||||||
"-c",
|
"arguments": [
|
||||||
"exit 2"
|
"-c",
|
||||||
]
|
"exit 2"
|
||||||
},
|
],
|
||||||
"OpenStdin" : false,
|
"entrypoint": "sh",
|
||||||
"OpenStderr" : false,
|
"privileged": false,
|
||||||
"OpenStdout" : false,
|
"tty": true,
|
||||||
"Container" : {
|
"user": "1000"
|
||||||
"State" : {
|
|
||||||
"Status" : "running",
|
|
||||||
"Running" : true,
|
|
||||||
"Paused" : false,
|
|
||||||
"Restarting" : false,
|
|
||||||
"OOMKilled" : false,
|
|
||||||
"Pid" : 3650,
|
|
||||||
"ExitCode" : 0,
|
|
||||||
"Error" : "",
|
|
||||||
"StartedAt" : "2014-11-17T22:26:03.717657531Z",
|
|
||||||
"FinishedAt" : "0001-01-01T00:00:00Z"
|
|
||||||
},
|
},
|
||||||
"ID" : "8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c",
|
"Running": false
|
||||||
"Created" : "2014-11-17T22:26:03.626304998Z",
|
|
||||||
"Path" : "date",
|
|
||||||
"Args" : [],
|
|
||||||
"Config" : {
|
|
||||||
"Hostname" : "8f177a186b97",
|
|
||||||
"Domainname" : "",
|
|
||||||
"User" : "",
|
|
||||||
"AttachStdin" : false,
|
|
||||||
"AttachStdout" : false,
|
|
||||||
"AttachStderr" : false,
|
|
||||||
"ExposedPorts" : null,
|
|
||||||
"Tty" : false,
|
|
||||||
"OpenStdin" : false,
|
|
||||||
"StdinOnce" : false,
|
|
||||||
"Env" : [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ],
|
|
||||||
"Cmd" : [
|
|
||||||
"date"
|
|
||||||
],
|
|
||||||
"Image" : "ubuntu",
|
|
||||||
"Volumes" : null,
|
|
||||||
"WorkingDir" : "",
|
|
||||||
"Entrypoint" : null,
|
|
||||||
"NetworkDisabled" : false,
|
|
||||||
"MacAddress" : "",
|
|
||||||
"OnBuild" : null,
|
|
||||||
"SecurityOpt" : null
|
|
||||||
},
|
|
||||||
"Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5",
|
|
||||||
"NetworkSettings": {
|
|
||||||
"Bridge": "",
|
|
||||||
"SandboxID": "",
|
|
||||||
"HairpinMode": false,
|
|
||||||
"LinkLocalIPv6Address": "",
|
|
||||||
"LinkLocalIPv6PrefixLen": 0,
|
|
||||||
"Ports": null,
|
|
||||||
"SandboxKey": "",
|
|
||||||
"SecondaryIPAddresses": null,
|
|
||||||
"SecondaryIPv6Addresses": null,
|
|
||||||
"EndpointID": "",
|
|
||||||
"Gateway": "",
|
|
||||||
"GlobalIPv6Address": "",
|
|
||||||
"GlobalIPv6PrefixLen": 0,
|
|
||||||
"IPAddress": "",
|
|
||||||
"IPPrefixLen": 0,
|
|
||||||
"IPv6Gateway": "",
|
|
||||||
"MacAddress": "",
|
|
||||||
"Networks": {
|
|
||||||
"bridge": {
|
|
||||||
"NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
|
|
||||||
"EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
|
|
||||||
"Gateway": "172.17.0.1",
|
|
||||||
"IPAddress": "172.17.0.2",
|
|
||||||
"IPPrefixLen": 16,
|
|
||||||
"IPv6Gateway": "",
|
|
||||||
"GlobalIPv6Address": "",
|
|
||||||
"GlobalIPv6PrefixLen": 0,
|
|
||||||
"MacAddress": "02:42:ac:12:00:02"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf",
|
|
||||||
"HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname",
|
|
||||||
"HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts",
|
|
||||||
"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
|
|
||||||
"Name" : "/test",
|
|
||||||
"Driver" : "aufs",
|
|
||||||
"ExecDriver" : "native-0.2",
|
|
||||||
"MountLabel" : "",
|
|
||||||
"ProcessLabel" : "",
|
|
||||||
"AppArmorProfile" : "",
|
|
||||||
"RestartCount" : 0,
|
|
||||||
"Mounts" : []
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
|
||||||
|
|
@ -2590,7 +2590,7 @@ Sets up an exec instance in a running container `id`
|
||||||
|
|
||||||
**Example response**:
|
**Example response**:
|
||||||
|
|
||||||
HTTP/1.1 201 OK
|
HTTP/1.1 201 Created
|
||||||
Content-Type: application/json
|
Content-Type: application/json
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
@ -2637,8 +2637,8 @@ interactive session with the `exec` command.
|
||||||
|
|
||||||
**Example response**:
|
**Example response**:
|
||||||
|
|
||||||
HTTP/1.1 201 OK
|
HTTP/1.1 200 OK
|
||||||
Content-Type: application/json
|
Content-Type: vnd.docker.raw-stream
|
||||||
|
|
||||||
{{ STREAM }}
|
{{ STREAM }}
|
||||||
|
|
||||||
|
|
@ -2696,112 +2696,28 @@ Return low-level information about the `exec` command `id`.
|
||||||
**Example response**:
|
**Example response**:
|
||||||
|
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Content-Type: plain/text
|
Content-Type: application/json
|
||||||
|
|
||||||
{
|
{
|
||||||
"ID" : "11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39",
|
"CanRemove": false,
|
||||||
"Running" : false,
|
"ContainerID": "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126",
|
||||||
"ExitCode" : 2,
|
"DetachKeys": "",
|
||||||
"ProcessConfig" : {
|
"ExitCode": 2,
|
||||||
"privileged" : false,
|
"ID": "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b",
|
||||||
"user" : "",
|
"OpenStderr": true,
|
||||||
"tty" : false,
|
"OpenStdin": true,
|
||||||
"entrypoint" : "sh",
|
"OpenStdout": true,
|
||||||
"arguments" : [
|
"ProcessConfig": {
|
||||||
"-c",
|
"arguments": [
|
||||||
"exit 2"
|
"-c",
|
||||||
]
|
"exit 2"
|
||||||
},
|
],
|
||||||
"OpenStdin" : false,
|
"entrypoint": "sh",
|
||||||
"OpenStderr" : false,
|
"privileged": false,
|
||||||
"OpenStdout" : false,
|
"tty": true,
|
||||||
"Container" : {
|
"user": "1000"
|
||||||
"State" : {
|
|
||||||
"Status" : "running",
|
|
||||||
"Running" : true,
|
|
||||||
"Paused" : false,
|
|
||||||
"Restarting" : false,
|
|
||||||
"OOMKilled" : false,
|
|
||||||
"Pid" : 3650,
|
|
||||||
"ExitCode" : 0,
|
|
||||||
"Error" : "",
|
|
||||||
"StartedAt" : "2014-11-17T22:26:03.717657531Z",
|
|
||||||
"FinishedAt" : "0001-01-01T00:00:00Z"
|
|
||||||
},
|
},
|
||||||
"ID" : "8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c",
|
"Running": false
|
||||||
"Created" : "2014-11-17T22:26:03.626304998Z",
|
|
||||||
"Path" : "date",
|
|
||||||
"Args" : [],
|
|
||||||
"Config" : {
|
|
||||||
"Hostname" : "8f177a186b97",
|
|
||||||
"Domainname" : "",
|
|
||||||
"User" : "",
|
|
||||||
"AttachStdin" : false,
|
|
||||||
"AttachStdout" : false,
|
|
||||||
"AttachStderr" : false,
|
|
||||||
"ExposedPorts" : null,
|
|
||||||
"Tty" : false,
|
|
||||||
"OpenStdin" : false,
|
|
||||||
"StdinOnce" : false,
|
|
||||||
"Env" : [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ],
|
|
||||||
"Cmd" : [
|
|
||||||
"date"
|
|
||||||
],
|
|
||||||
"Image" : "ubuntu",
|
|
||||||
"Volumes" : null,
|
|
||||||
"WorkingDir" : "",
|
|
||||||
"Entrypoint" : null,
|
|
||||||
"NetworkDisabled" : false,
|
|
||||||
"MacAddress" : "",
|
|
||||||
"OnBuild" : null,
|
|
||||||
"SecurityOpt" : null
|
|
||||||
},
|
|
||||||
"Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5",
|
|
||||||
"NetworkSettings": {
|
|
||||||
"Bridge": "",
|
|
||||||
"SandboxID": "",
|
|
||||||
"HairpinMode": false,
|
|
||||||
"LinkLocalIPv6Address": "",
|
|
||||||
"LinkLocalIPv6PrefixLen": 0,
|
|
||||||
"Ports": null,
|
|
||||||
"SandboxKey": "",
|
|
||||||
"SecondaryIPAddresses": null,
|
|
||||||
"SecondaryIPv6Addresses": null,
|
|
||||||
"EndpointID": "",
|
|
||||||
"Gateway": "",
|
|
||||||
"GlobalIPv6Address": "",
|
|
||||||
"GlobalIPv6PrefixLen": 0,
|
|
||||||
"IPAddress": "",
|
|
||||||
"IPPrefixLen": 0,
|
|
||||||
"IPv6Gateway": "",
|
|
||||||
"MacAddress": "",
|
|
||||||
"Networks": {
|
|
||||||
"bridge": {
|
|
||||||
"NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
|
|
||||||
"EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
|
|
||||||
"Gateway": "172.17.0.1",
|
|
||||||
"IPAddress": "172.17.0.2",
|
|
||||||
"IPPrefixLen": 16,
|
|
||||||
"IPv6Gateway": "",
|
|
||||||
"GlobalIPv6Address": "",
|
|
||||||
"GlobalIPv6PrefixLen": 0,
|
|
||||||
"MacAddress": "02:42:ac:12:00:02"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf",
|
|
||||||
"HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname",
|
|
||||||
"HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts",
|
|
||||||
"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
|
|
||||||
"Name" : "/test",
|
|
||||||
"Driver" : "aufs",
|
|
||||||
"ExecDriver" : "native-0.2",
|
|
||||||
"MountLabel" : "",
|
|
||||||
"ProcessLabel" : "",
|
|
||||||
"AppArmorProfile" : "",
|
|
||||||
"RestartCount" : 0,
|
|
||||||
"Mounts" : []
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
|
||||||
|
|
@ -2594,7 +2594,7 @@ Sets up an exec instance in a running container `id`
|
||||||
|
|
||||||
**Example response**:
|
**Example response**:
|
||||||
|
|
||||||
HTTP/1.1 201 OK
|
HTTP/1.1 201 Created
|
||||||
Content-Type: application/json
|
Content-Type: application/json
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
@ -2641,8 +2641,8 @@ interactive session with the `exec` command.
|
||||||
|
|
||||||
**Example response**:
|
**Example response**:
|
||||||
|
|
||||||
HTTP/1.1 201 OK
|
HTTP/1.1 200 OK
|
||||||
Content-Type: application/json
|
Content-Type: application/vnd.docker.raw-stream
|
||||||
|
|
||||||
{{ STREAM }}
|
{{ STREAM }}
|
||||||
|
|
||||||
|
|
@ -2700,112 +2700,28 @@ Return low-level information about the `exec` command `id`.
|
||||||
**Example response**:
|
**Example response**:
|
||||||
|
|
||||||
HTTP/1.1 200 OK
|
HTTP/1.1 200 OK
|
||||||
Content-Type: plain/text
|
Content-Type: application/json
|
||||||
|
|
||||||
{
|
{
|
||||||
"ID" : "11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39",
|
"CanRemove": false,
|
||||||
"Running" : false,
|
"ContainerID": "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126",
|
||||||
"ExitCode" : 2,
|
"DetachKeys": "",
|
||||||
"ProcessConfig" : {
|
"ExitCode": 2,
|
||||||
"privileged" : false,
|
"ID": "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b",
|
||||||
"user" : "",
|
"OpenStderr": true,
|
||||||
"tty" : false,
|
"OpenStdin": true,
|
||||||
"entrypoint" : "sh",
|
"OpenStdout": true,
|
||||||
"arguments" : [
|
"ProcessConfig": {
|
||||||
"-c",
|
"arguments": [
|
||||||
"exit 2"
|
"-c",
|
||||||
]
|
"exit 2"
|
||||||
},
|
],
|
||||||
"OpenStdin" : false,
|
"entrypoint": "sh",
|
||||||
"OpenStderr" : false,
|
"privileged": false,
|
||||||
"OpenStdout" : false,
|
"tty": true,
|
||||||
"Container" : {
|
"user": "1000"
|
||||||
"State" : {
|
|
||||||
"Status" : "running",
|
|
||||||
"Running" : true,
|
|
||||||
"Paused" : false,
|
|
||||||
"Restarting" : false,
|
|
||||||
"OOMKilled" : false,
|
|
||||||
"Pid" : 3650,
|
|
||||||
"ExitCode" : 0,
|
|
||||||
"Error" : "",
|
|
||||||
"StartedAt" : "2014-11-17T22:26:03.717657531Z",
|
|
||||||
"FinishedAt" : "0001-01-01T00:00:00Z"
|
|
||||||
},
|
},
|
||||||
"ID" : "8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c",
|
"Running": false
|
||||||
"Created" : "2014-11-17T22:26:03.626304998Z",
|
|
||||||
"Path" : "date",
|
|
||||||
"Args" : [],
|
|
||||||
"Config" : {
|
|
||||||
"Hostname" : "8f177a186b97",
|
|
||||||
"Domainname" : "",
|
|
||||||
"User" : "",
|
|
||||||
"AttachStdin" : false,
|
|
||||||
"AttachStdout" : false,
|
|
||||||
"AttachStderr" : false,
|
|
||||||
"ExposedPorts" : null,
|
|
||||||
"Tty" : false,
|
|
||||||
"OpenStdin" : false,
|
|
||||||
"StdinOnce" : false,
|
|
||||||
"Env" : [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ],
|
|
||||||
"Cmd" : [
|
|
||||||
"date"
|
|
||||||
],
|
|
||||||
"Image" : "ubuntu",
|
|
||||||
"Volumes" : null,
|
|
||||||
"WorkingDir" : "",
|
|
||||||
"Entrypoint" : null,
|
|
||||||
"NetworkDisabled" : false,
|
|
||||||
"MacAddress" : "",
|
|
||||||
"OnBuild" : null,
|
|
||||||
"SecurityOpt" : null
|
|
||||||
},
|
|
||||||
"Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5",
|
|
||||||
"NetworkSettings": {
|
|
||||||
"Bridge": "",
|
|
||||||
"SandboxID": "",
|
|
||||||
"HairpinMode": false,
|
|
||||||
"LinkLocalIPv6Address": "",
|
|
||||||
"LinkLocalIPv6PrefixLen": 0,
|
|
||||||
"Ports": null,
|
|
||||||
"SandboxKey": "",
|
|
||||||
"SecondaryIPAddresses": null,
|
|
||||||
"SecondaryIPv6Addresses": null,
|
|
||||||
"EndpointID": "",
|
|
||||||
"Gateway": "",
|
|
||||||
"GlobalIPv6Address": "",
|
|
||||||
"GlobalIPv6PrefixLen": 0,
|
|
||||||
"IPAddress": "",
|
|
||||||
"IPPrefixLen": 0,
|
|
||||||
"IPv6Gateway": "",
|
|
||||||
"MacAddress": "",
|
|
||||||
"Networks": {
|
|
||||||
"bridge": {
|
|
||||||
"NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
|
|
||||||
"EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
|
|
||||||
"Gateway": "172.17.0.1",
|
|
||||||
"IPAddress": "172.17.0.2",
|
|
||||||
"IPPrefixLen": 16,
|
|
||||||
"IPv6Gateway": "",
|
|
||||||
"GlobalIPv6Address": "",
|
|
||||||
"GlobalIPv6PrefixLen": 0,
|
|
||||||
"MacAddress": "02:42:ac:12:00:02"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf",
|
|
||||||
"HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname",
|
|
||||||
"HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts",
|
|
||||||
"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
|
|
||||||
"Name" : "/test",
|
|
||||||
"Driver" : "aufs",
|
|
||||||
"ExecDriver" : "native-0.2",
|
|
||||||
"MountLabel" : "",
|
|
||||||
"ProcessLabel" : "",
|
|
||||||
"AppArmorProfile" : "",
|
|
||||||
"RestartCount" : 0,
|
|
||||||
"Mounts" : []
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Status Codes:
|
Status Codes:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue