From 69db6ea867ca155ecf6c342e82df491cdcd6aa96 Mon Sep 17 00:00:00 2001 From: James Turnbull Date: Thu, 2 Jan 2014 04:17:33 -0500 Subject: [PATCH] Added some 1.7 API updates that were missing from 1.8 --- docs/sources/api/docker_remote_api_v1.7.rst | 10 +++++----- docs/sources/api/docker_remote_api_v1.8.rst | 18 ++++++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/docs/sources/api/docker_remote_api_v1.7.rst b/docs/sources/api/docker_remote_api_v1.7.rst index c33b276d25..d47f672df0 100644 --- a/docs/sources/api/docker_remote_api_v1.7.rst +++ b/docs/sources/api/docker_remote_api_v1.7.rst @@ -135,12 +135,12 @@ Create a container "/tmp": {} }, "VolumesFrom":"", - "WorkingDir":"" - "ExposedPorts":{ - "22/tcp": {} - } + "WorkingDir":"", + "ExposedPorts":{ + "22/tcp": {} + } } - + **Example response**: .. sourcecode:: http diff --git a/docs/sources/api/docker_remote_api_v1.8.rst b/docs/sources/api/docker_remote_api_v1.8.rst index 21dd4a46cf..3fe5cd73e0 100644 --- a/docs/sources/api/docker_remote_api_v1.8.rst +++ b/docs/sources/api/docker_remote_api_v1.8.rst @@ -122,7 +122,6 @@ Create a container "AttachStdout":true, "AttachStderr":true, "PortSpecs":null, - "Privileged": false, "Tty":false, "OpenStdin":false, "StdinOnce":false, @@ -132,12 +131,16 @@ Create a container ], "Dns":null, "Image":"base", - "Volumes":{}, + "Volumes":{ + "/tmp": {} + }, "VolumesFrom":"", - "WorkingDir":"" - + "WorkingDir":"", + "ExposedPorts":{ + "22/tcp": {} + } } - + **Example response**: .. sourcecode:: http @@ -378,7 +381,10 @@ Start a container { "Binds":["/tmp:/tmp"], - "LxcConf":{"lxc.utsname":"docker"} + "LxcConf":{"lxc.utsname":"docker"}, + "PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] }, + "PublishAllPorts":false, + "Privileged":false } **Example response**: