Browse code

docs: move sysctls docs to current API version

Signed-off-by: Alexander Morozov <lk4d4@docker.com>

Alexander Morozov authored on 2016/06/15 07:14:16
Showing 3 changed files
... ...
@@ -132,6 +132,7 @@ This section lists each version from latest to oldest.  Each listing includes a
132 132
 * `GET /images/search` now supports maximum returned search results `limit`.
133 133
 * `POST /containers/{name:.*}/copy` is now removed and errors out starting from this API version.
134 134
 * API errors are now returned as JSON instead of plain text.
135
+* `POST /containers/create` and `POST /containers/(id)/start` allow you to configure kernel parameters (sysctls) for use in the container.
135 136
 
136 137
 ### v1.23 API changes
137 138
 
... ...
@@ -192,7 +193,6 @@ This section lists each version from latest to oldest.  Each listing includes a
192 192
 
193 193
 [Docker Remote API v1.21](docker_remote_api_v1.21.md) documentation
194 194
 
195
-* `POST /containers/create` and `POST /containers/(id)/start` allow you to configure kernel parameters (sysctls) for use in the container.
196 195
 * `GET /volumes` lists volumes from all volume drivers.
197 196
 * `POST /volumes/create` to create a volume.
198 197
 * `GET /volumes/(name)` get low-level information about a volume.
... ...
@@ -306,10 +306,6 @@ Json Parameters:
306 306
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
307 307
       form
308 308
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
309
-    -   **Sysctls** - A list of kernel parameters (sysctls) to set in the container, specified as
310
-          `{ <name>: <Value> }`, for example:
311
-	  `{ "net.ipv4.ip_forward": "1" }`
312
-
313 309
     -   **Ulimits** - A list of ulimits to set in the container, specified as
314 310
           `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
315 311
           `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
... ...
@@ -431,9 +427,6 @@ Return low-level information on the container `id`
431 431
 				"Type": "json-file"
432 432
 			},
433 433
 			"SecurityOpt": null,
434
-			"Sysctls": {
435
-			        "net.ipv4.ip_forward": "1"
436
-			},
437 434
 			"VolumesFrom": null,
438 435
 			"Ulimits": [{}],
439 436
 			"VolumeDriver": ""
... ...
@@ -461,6 +461,9 @@ Create a container
461 461
     -   **Ulimits** - A list of ulimits to set in the container, specified as
462 462
           `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
463 463
           `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
464
+    -   **Sysctls** - A list of kernel parameters (sysctls) to set in the container, specified as
465
+          `{ <name>: <Value> }`, for example:
466
+	  `{ "net.ipv4.ip_forward": "1" }`
464 467
     -   **SecurityOpt**: A list of string values to customize labels for MLS
465 468
         systems, such as SELinux.
466 469
     -   **StorageOpt**: Storage driver options per container. Options can be passed in the form
... ...
@@ -592,6 +595,9 @@ Return low-level information on the container `id`
592 592
 				"Type": "json-file"
593 593
 			},
594 594
 			"SecurityOpt": null,
595
+			"Sysctls": {
596
+			        "net.ipv4.ip_forward": "1"
597
+			},
595 598
 			"StorageOpt": null,
596 599
 			"VolumesFrom": null,
597 600
 			"Ulimits": [{}],