Explorar o código

Merge pull request #3428 from jamtur01/port1.8

Added some 1.7 API updates that were missing from 1.8
Andy Rothfusz %!s(int64=11) %!d(string=hai) anos
pai
achega
8f4a54734f

+ 5 - 5
docs/sources/api/docker_remote_api_v1.7.rst

@@ -135,12 +135,12 @@ Create a container
 			"/tmp": {}
 			"/tmp": {}
 		},
 		},
 		"VolumesFrom":"",
 		"VolumesFrom":"",
-		"WorkingDir":""
-    "ExposedPorts":{
-      "22/tcp": {}
-    }
+		"WorkingDir":"",
+		"ExposedPorts":{
+			"22/tcp": {}
+		}
 	   }
 	   }
-	
+
 	**Example response**:
 	**Example response**:
 
 
 	.. sourcecode:: http
 	.. sourcecode:: http

+ 12 - 6
docs/sources/api/docker_remote_api_v1.8.rst

@@ -122,7 +122,6 @@ Create a container
 		"AttachStdout":true,
 		"AttachStdout":true,
 		"AttachStderr":true,
 		"AttachStderr":true,
 		"PortSpecs":null,
 		"PortSpecs":null,
-		"Privileged": false,
 		"Tty":false,
 		"Tty":false,
 		"OpenStdin":false,
 		"OpenStdin":false,
 		"StdinOnce":false,
 		"StdinOnce":false,
@@ -132,12 +131,16 @@ Create a container
 		],
 		],
 		"Dns":null,
 		"Dns":null,
 		"Image":"base",
 		"Image":"base",
-		"Volumes":{},
+		"Volumes":{
+			"/tmp": {}
+		},
 		"VolumesFrom":"",
 		"VolumesFrom":"",
-		"WorkingDir":""
-
+		"WorkingDir":"",
+		"ExposedPorts":{
+			"22/tcp": {}
+		}
 	   }
 	   }
-	   
+
 	**Example response**:
 	**Example response**:
 
 
 	.. sourcecode:: http
 	.. sourcecode:: http
@@ -378,7 +381,10 @@ Start a container
 
 
            {
            {
                 "Binds":["/tmp:/tmp"],
                 "Binds":["/tmp:/tmp"],
-                "LxcConf":{"lxc.utsname":"docker"}
+                "LxcConf":{"lxc.utsname":"docker"},
+                "PortBindings":{ "22/tcp": [{ "HostPort": "11022" }] },
+                "PublishAllPorts":false,
+                "Privileged":false
            }
            }
 
 
         **Example response**:
         **Example response**: