diff --git a/docs/man/docker-create.1.md b/docs/man/docker-create.1.md index ddb234d377a5f8adac22650ce5efe2f7b633781c..62a4c60bb1278cd447f89e25a809c498c3d27a3f 100644 --- a/docs/man/docker-create.1.md +++ b/docs/man/docker-create.1.md @@ -46,6 +46,7 @@ docker-create - Create a new container [**-v**|**--volume**[=*[]*]] [**--volumes-from**[=*[]*]] [**-w**|**--workdir**[=*WORKDIR*]] +[**--cgroup-parent**[=*CGROUP-PATH*]] IMAGE [COMMAND] [ARG...] # OPTIONS @@ -67,6 +68,9 @@ IMAGE [COMMAND] [ARG...] **--cidfile**="" Write the container ID to the file +**--cgroup-parent**="" + Path to cgroups under which the cgroup for the container will be created. If the path is not absolute, the path is considered to be relative to the cgroups path of the init process. Cgroups will be created if they do not already exist. + **--cpuset-cpus**="" CPUs in which to allow execution (0-3, 0,1) diff --git a/docs/man/docker-run.1.md b/docs/man/docker-run.1.md index 7e8187744fe873d8d28a7da96e9318bbf0b2d6e0..c95c69e7099f35a1e06753dc847e47af21ed45dd 100644 --- a/docs/man/docker-run.1.md +++ b/docs/man/docker-run.1.md @@ -49,6 +49,7 @@ docker-run - Run a command in a new container [**-v**|**--volume**[=*[]*]] [**--volumes-from**[=*[]*]] [**-w**|**--workdir**[=*WORKDIR*]] +[**--cgroup-parent**[=*CGROUP-PATH*]] IMAGE [COMMAND] [ARG...] # DESCRIPTION @@ -124,6 +125,9 @@ division of CPU shares: **--cap-drop**=[] Drop Linux capabilities +**--cgroup-parent**="" + Path to cgroups under which the cgroup for the container will be created. If the path is not absolute, the path is considered to be relative to the cgroups path of the init process. Cgroups will be created if they do not already exist. + **--cidfile**="" Write the container ID to the file diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index 0ab5cfe89750bffd77bd4bbecf0b9f2f42d4c0df..7b6d1bf60cf8dae1466f66cb5180466aa5151bb6 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -805,6 +805,7 @@ Creates a new container. -c, --cpu-shares=0 CPU shares (relative weight) --cap-add=[] Add Linux capabilities --cap-drop=[] Drop Linux capabilities + --cgroup-parent= Optional parent cgroup for the container --cidfile="" Write the container ID to the file --cpuset-cpus="" CPUs in which to allow execution (0-3, 0,1) --device=[] Add a host device to the container