Parcourir la source

Merge pull request #7828 from vieux/update_api_docs

Remote api docs for POST /containers/create were out of sync with runconfig/config.go
Sven Dowideit il y a 11 ans
Parent
commit
dbe1123607

+ 8 - 2
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": {}
              }

+ 8 - 2
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": {}
              }
@@ -1242,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,
@@ -1260,7 +1266,7 @@ Create a new image from a container's changes
                      "/tmp": {}
              },
              "WorkingDir":"",
-             "DisableNetwork": false,
+             "NetworkDisabled": false,
              "ExposedPorts":{
                      "22/tcp": {}
              }

+ 8 - 2
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": {}
              }
@@ -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": {}
              }

+ 8 - 2
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": {}
              }