Bläddra i källkod

Merge pull request #23543 from LK4D4/move_sysctls_docs

docs: move sysctls docs to current API version
Sebastiaan van Stijn 9 år sedan
förälder
incheckning
067b510dfc

+ 1 - 1
docs/reference/api/docker_remote_api.md

@@ -132,6 +132,7 @@ This section lists each version from latest to oldest.  Each listing includes a
 * `GET /images/search` now supports maximum returned search results `limit`.
 * `POST /containers/{name:.*}/copy` is now removed and errors out starting from this API version.
 * API errors are now returned as JSON instead of plain text.
+* `POST /containers/create` and `POST /containers/(id)/start` allow you to configure kernel parameters (sysctls) for use in the container.
 
 ### v1.23 API changes
 
@@ -192,7 +193,6 @@ This section lists each version from latest to oldest.  Each listing includes a
 
 [Docker Remote API v1.21](docker_remote_api_v1.21.md) documentation
 
-* `POST /containers/create` and `POST /containers/(id)/start` allow you to configure kernel parameters (sysctls) for use in the container.
 * `GET /volumes` lists volumes from all volume drivers.
 * `POST /volumes/create` to create a volume.
 * `GET /volumes/(name)` get low-level information about a volume.

+ 0 - 7
docs/reference/api/docker_remote_api_v1.21.md

@@ -306,10 +306,6 @@ Json Parameters:
     -   **Devices** - A list of devices to add to the container specified as a JSON object in the
       form
           `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
-    -   **Sysctls** - A list of kernel parameters (sysctls) to set in the container, specified as
-          `{ <name>: <Value> }`, for example:
-	  `{ "net.ipv4.ip_forward": "1" }`
-
     -   **Ulimits** - A list of ulimits to set in the container, specified as
           `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
           `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
@@ -431,9 +427,6 @@ Return low-level information on the container `id`
 				"Type": "json-file"
 			},
 			"SecurityOpt": null,
-			"Sysctls": {
-			        "net.ipv4.ip_forward": "1"
-			},
 			"VolumesFrom": null,
 			"Ulimits": [{}],
 			"VolumeDriver": ""

+ 6 - 0
docs/reference/api/docker_remote_api_v1.24.md

@@ -461,6 +461,9 @@ Create a container
     -   **Ulimits** - A list of ulimits to set in the container, specified as
           `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
           `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
+    -   **Sysctls** - A list of kernel parameters (sysctls) to set in the container, specified as
+          `{ <name>: <Value> }`, for example:
+	  `{ "net.ipv4.ip_forward": "1" }`
     -   **SecurityOpt**: A list of string values to customize labels for MLS
         systems, such as SELinux.
     -   **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`
 				"Type": "json-file"
 			},
 			"SecurityOpt": null,
+			"Sysctls": {
+			        "net.ipv4.ip_forward": "1"
+			},
 			"StorageOpt": null,
 			"VolumesFrom": null,
 			"Ulimits": [{}],