From eac6a5d78906a70ddc3264f8d0a87369aefaedf0 Mon Sep 17 00:00:00 2001 From: Anand Patil Date: Fri, 25 Jul 2014 09:42:25 -0700 Subject: [PATCH 1/2] v1.13 and 1.14 api docs now match runconfig/config.go --- docs/sources/reference/api/docker_remote_api_v1.13.md | 5 ++++- docs/sources/reference/api/docker_remote_api_v1.14.md | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/sources/reference/api/docker_remote_api_v1.13.md b/docs/sources/reference/api/docker_remote_api_v1.13.md index 69bb59d76e..b5922854e2 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.13.md +++ b/docs/sources/reference/api/docker_remote_api_v1.13.md @@ -110,9 +110,12 @@ Create a container { "Hostname":"", + "Domainname": "", "User":"", "Memory":0, "MemorySwap":0, + "CpuShares": 512, + "Cpuset": "0,1", "AttachStdin":false, "AttachStdout":true, "AttachStderr":true, @@ -129,7 +132,7 @@ Create a container "/tmp": {} }, "WorkingDir":"", - "DisableNetwork": false, + "NetworkDisabled": false, "ExposedPorts":{ "22/tcp": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.14.md b/docs/sources/reference/api/docker_remote_api_v1.14.md index 3058a6770f..b23414d803 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.14.md +++ b/docs/sources/reference/api/docker_remote_api_v1.14.md @@ -110,9 +110,12 @@ Create a container { "Hostname":"", + "Domainname": "", "User":"", "Memory":0, "MemorySwap":0, + "CpuShares": 512, + "Cpuset": "0,1", "AttachStdin":false, "AttachStdout":true, "AttachStderr":true, @@ -129,7 +132,7 @@ Create a container "/tmp": {} }, "WorkingDir":"", - "DisableNetwork": false, + "NetworkDisabled": false, "ExposedPorts":{ "22/tcp": {} } From 2d8695761d0241d2c9b8bfe4274674c702c6a14d Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Mon, 1 Sep 2014 18:41:42 +0000 Subject: [PATCH 2/2] more updates Signed-off-by: Victor Vieux --- docs/sources/reference/api/docker_remote_api_v1.12.md | 10 ++++++++-- docs/sources/reference/api/docker_remote_api_v1.13.md | 5 ++++- docs/sources/reference/api/docker_remote_api_v1.14.md | 5 ++++- docs/sources/reference/api/docker_remote_api_v1.15.md | 10 ++++++++-- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/docs/sources/reference/api/docker_remote_api_v1.12.md b/docs/sources/reference/api/docker_remote_api_v1.12.md index d0fa77b0ae..4ca1d6044d 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.12.md +++ b/docs/sources/reference/api/docker_remote_api_v1.12.md @@ -112,9 +112,12 @@ Create a container { "Hostname":"", + "Domainname": "", "User":"", "Memory":0, "MemorySwap":0, + "CpuShares": 512, + "Cpuset": "0,1", "AttachStdin":false, "AttachStdout":true, "AttachStderr":true, @@ -131,7 +134,7 @@ Create a container "/tmp": {} }, "WorkingDir":"", - "DisableNetwork": false, + "NetworkDisabled": false, "ExposedPorts":{ "22/tcp": {} } @@ -1244,9 +1247,12 @@ Create a new image from a container's changes { "Hostname":"", + "Domainname": "", "User":"", "Memory":0, "MemorySwap":0, + "CpuShares": 512, + "Cpuset": "0,1", "AttachStdin":false, "AttachStdout":true, "AttachStderr":true, @@ -1262,7 +1268,7 @@ Create a new image from a container's changes "/tmp": {} }, "WorkingDir":"", - "DisableNetwork": false, + "NetworkDisabled": false, "ExposedPorts":{ "22/tcp": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.13.md b/docs/sources/reference/api/docker_remote_api_v1.13.md index b5922854e2..37358b8b0d 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.13.md +++ b/docs/sources/reference/api/docker_remote_api_v1.13.md @@ -1245,9 +1245,12 @@ Create a new image from a container's changes { "Hostname":"", + "Domainname": "", "User":"", "Memory":0, "MemorySwap":0, + "CpuShares": 512, + "Cpuset": "0,1", "AttachStdin":false, "AttachStdout":true, "AttachStderr":true, @@ -1263,7 +1266,7 @@ Create a new image from a container's changes "/tmp": {} }, "WorkingDir":"", - "DisableNetwork": false, + "NetworkDisabled": false, "ExposedPorts":{ "22/tcp": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.14.md b/docs/sources/reference/api/docker_remote_api_v1.14.md index b23414d803..ec38b8fc1a 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.14.md +++ b/docs/sources/reference/api/docker_remote_api_v1.14.md @@ -1249,9 +1249,12 @@ Create a new image from a container's changes { "Hostname":"", + "Domainname": "", "User":"", "Memory":0, "MemorySwap":0, + "CpuShares": 512, + "Cpuset": "0,1", "AttachStdin":false, "AttachStdout":true, "AttachStderr":true, @@ -1267,7 +1270,7 @@ Create a new image from a container's changes "/tmp": {} }, "WorkingDir":"", - "DisableNetwork": false, + "NetworkDisabled": false, "ExposedPorts":{ "22/tcp": {} } diff --git a/docs/sources/reference/api/docker_remote_api_v1.15.md b/docs/sources/reference/api/docker_remote_api_v1.15.md index 03446c2870..fca8669dce 100644 --- a/docs/sources/reference/api/docker_remote_api_v1.15.md +++ b/docs/sources/reference/api/docker_remote_api_v1.15.md @@ -110,9 +110,12 @@ Create a container { "Hostname":"", + "Domainname": "", "User":"", "Memory":0, "MemorySwap":0, + "CpuShares": 512, + "Cpuset": "0,1", "AttachStdin":false, "AttachStdout":true, "AttachStderr":true, @@ -129,7 +132,7 @@ Create a container "/tmp": {} }, "WorkingDir":"", - "DisableNetwork": false, + "NetworkDisabled": false, "ExposedPorts":{ "22/tcp": {} } @@ -1246,9 +1249,12 @@ Create a new image from a container's changes { "Hostname":"", + "Domainname": "", "User":"", "Memory":0, "MemorySwap":0, + "CpuShares": 512, + "Cpuset": "0,1", "AttachStdin":false, "AttachStdout":true, "AttachStderr":true, @@ -1264,7 +1270,7 @@ Create a new image from a container's changes "/tmp": {} }, "WorkingDir":"", - "DisableNetwork": false, + "NetworkDisabled": false, "ExposedPorts":{ "22/tcp": {} }