@@ -25,10 +25,10 @@ Creates a new container.

       --cap-drop=[]              Drop Linux capabilities

       --cgroup-parent=""         Optional parent cgroup for the container

       --cidfile=""               Write the container ID to the file

+      --cpu-period=0             Limit CPU CFS (Completely Fair Scheduler) period

+      --cpu-quota=0              Limit CPU CFS (Completely Fair Scheduler) quota

       --cpuset-cpus=""           CPUs in which to allow execution (0-3, 0,1)

       --cpuset-mems=""           Memory nodes (MEMs) in which to allow execution (0-3, 0,1)

-      --cpu-period=0             Limit the CPU CFS (Completely Fair Scheduler) period

-      --cpu-quota=0              Limit the CPU CFS (Completely Fair Scheduler) quota

       --device=[]                Add a host device to the container

       --dns=[]                   Set custom DNS servers

       --dns-search=[]            Set custom DNS search domains

@@ -37,6 +37,7 @@ Creates a new container.

       --env-file=[]              Read in a file of environment variables

       --expose=[]                Expose a port or a range of ports

       -h, --hostname=""          Container host name

+      --help=false               Print usage

       -i, --interactive=false    Keep STDIN open even if not attached

       --ipc=""                   IPC namespace to use

       -l, --label=[]             Set metadata on the container (e.g., --label=com.example.key=value)

@@ -47,20 +48,22 @@ Creates a new container.

       --lxc-conf=[]              Add custom lxc options

       -m, --memory=""            Memory limit

       --mac-address=""           Container MAC address (e.g. 92:d0:c6:0a:29:33)

+      --memory-swap=""           Total memory (memory + swap), '-1' to disable swap

+      --memory-swappiness=""     Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.

       --name=""                  Assign a name to the container

       --net="bridge"             Set the Network mode for the container

       --oom-kill-disable=false   Whether to disable OOM Killer for the container or not

       -P, --publish-all=false    Publish all exposed ports to random ports

       -p, --publish=[]           Publish a container's port(s) to the host

       --pid=""                   PID namespace to use

-      --uts=""                   UTS namespace to use

       --privileged=false         Give extended privileges to this container

       --read-only=false          Mount the container's root filesystem as read only

       --restart="no"             Restart policy (no, on-failure[:max-retry], always)

-      --memory-swappiness=""     Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.

       --security-opt=[]          Security options

       -t, --tty=false            Allocate a pseudo-TTY

       -u, --user=""              Username or UID

+      --ulimit=[]                Ulimit options

+      --uts=""                   UTS namespace to use

       -v, --volume=[]            Bind mount a volume

       --volumes-from=[]          Mount volumes from the specified container(s)

       -w, --workdir=""           Working directory inside the container

@@ -21,11 +21,12 @@ weight=1

       -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

+      --cpu-period=0             Limit CPU CFS (Completely Fair Scheduler) period

+      --cpu-quota=0              Limit CPU CFS (Completely Fair Scheduler) quota

       --cpuset-cpus=""           CPUs in which to allow execution (0-3, 0,1)

       --cpuset-mems=""           Memory nodes (MEMs) in which to allow execution (0-3, 0,1)

-      --cpu-period=0             Limit the CPU CFS (Completely Fair Scheduler) period

-      --cpu-quota=0              Limit the CPU CFS (Completely Fair Scheduler) quota

       -d, --detach=false         Run container in background and print container ID

       --device=[]                Add a host device to the container

       --dns=[]                   Set custom DNS servers

@@ -39,31 +40,32 @@ weight=1

       --help=false               Print usage

       -i, --interactive=false    Keep STDIN open even if not attached

       --ipc=""                   IPC namespace to use

+      -l, --label=[]             Set metadata on the container (e.g., --label=com.example.key=value)

+      --label-file=[]            Read in a file of labels (EOL delimited)

       --link=[]                  Add link to another container

       --log-driver=""            Logging driver for container

       --log-opt=[]               Log driver specific options

       --lxc-conf=[]              Add custom lxc options

       -m, --memory=""            Memory limit

-      -l, --label=[]             Set metadata on the container (e.g., --label=com.example.key=value)

-      --label-file=[]            Read in a file of labels (EOL delimited)

       --mac-address=""           Container MAC address (e.g. 92:d0:c6:0a:29:33)

       --memory-swap=""           Total memory (memory + swap), '-1' to disable swap

+      --memory-swappiness=""     Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.

       --name=""                  Assign a name to the container

       --net="bridge"             Set the Network mode for the container

       --oom-kill-disable=false   Whether to disable OOM Killer for the container or not

       -P, --publish-all=false    Publish all exposed ports to random ports

       -p, --publish=[]           Publish a container's port(s) to the host

       --pid=""                   PID namespace to use

-      --uts=""                   UTS namespace to use

       --privileged=false         Give extended privileges to this container

       --read-only=false          Mount the container's root filesystem as read only

       --restart="no"             Restart policy (no, on-failure[:max-retry], always)

       --rm=false                 Automatically remove the container when it exits

-      --memory-swappiness=""     Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.

       --security-opt=[]          Security Options

       --sig-proxy=true           Proxy received signals to the process

       -t, --tty=false            Allocate a pseudo-TTY

       -u, --user=""              Username or UID (format: <name|uid>[:<group|gid>])

+      --ulimit=[]                Ulimit options

+      --uts=""                   UTS namespace to use

       -v, --volume=[]            Bind mount a volume

       --volumes-from=[]          Mount volumes from the specified container(s)

       -w, --workdir=""           Working directory inside the container

@@ -12,14 +12,15 @@ docker-create - Create a new container

 [**-c**|**--cpu-shares**[=*0*]]

 [**--cap-add**[=*[]*]]

 [**--cap-drop**[=*[]*]]

+[**--cgroup-parent**[=*CGROUP-PATH*]]

 [**--cidfile**[=*CIDFILE*]]

 [**--cpu-period**[=*0*]]

+[**--cpu-quota**[=*0*]]

 [**--cpuset-cpus**[=*CPUSET-CPUS*]]

 [**--cpuset-mems**[=*CPUSET-MEMS*]]

-[**--cpu-quota**[=*0*]]

 [**--device**[=*[]*]]

-[**--dns-search**[=*[]*]]

 [**--dns**[=*[]*]]

+[**--dns-search**[=*[]*]]

 [**-e**|**--env**[=*[]*]]

 [**--entrypoint**[=*ENTRYPOINT*]]

 [**--env-file**[=*[]*]]

@@ -32,30 +33,30 @@ docker-create - Create a new container

 [**-l**|**--label**[=*[]*]]

 [**--label-file**[=*[]*]]

 [**--link**[=*[]*]]

-[**--lxc-conf**[=*[]*]]

 [**--log-driver**[=*[]*]]

 [**--log-opt**[=*[]*]]

+[**--lxc-conf**[=*[]*]]

 [**-m**|**--memory**[=*MEMORY*]]

-[**--memory-swap**[=*MEMORY-SWAP*]]

 [**--mac-address**[=*MAC-ADDRESS*]]

+[**--memory-swap**[=*MEMORY-SWAP*]]

+[**--memory-swappiness**[=*MEMORY-SWAPPINESS*]]

 [**--name**[=*NAME*]]

 [**--net**[=*"bridge"*]]

 [**--oom-kill-disable**[=*false*]]

 [**-P**|**--publish-all**[=*false*]]

 [**-p**|**--publish**[=*[]*]]

 [**--pid**[=*[]*]]

-[**--uts**[=*[]*]]

 [**--privileged**[=*false*]]

 [**--read-only**[=*false*]]

 [**--restart**[=*RESTART*]]

 [**--security-opt**[=*[]*]]

-[**--memory-swappiness**[=*MEMORY-SWAPPINESS*]]

 [**-t**|**--tty**[=*false*]]

 [**-u**|**--user**[=*USER*]]

+[**--ulimit**[=*[]*]]

+[**--uts**[=*[]*]]

 [**-v**|**--volume**[=*[]*]]

 [**--volumes-from**[=*[]*]]

 [**-w**|**--workdir**[=*WORKDIR*]]

-[**--cgroup-parent**[=*CGROUP-PATH*]]

 IMAGE [COMMAND] [ARG...]

 # DESCRIPTION

@@ -239,6 +240,9 @@ This value should always larger than **-m**, so you should always use this with

 **-u**, **--user**=""

    Username or UID

+**--ulimit**=[]

+   Ulimit options

+

 **-v**, **--volume**=[]

    Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container)

@@ -12,15 +12,16 @@ docker-run - Run a command in a new container

 [**-c**|**--cpu-shares**[=*0*]]

 [**--cap-add**[=*[]*]]

 [**--cap-drop**[=*[]*]]

+[**--cgroup-parent**[=*CGROUP-PATH*]]

 [**--cidfile**[=*CIDFILE*]]

 [**--cpu-period**[=*0*]]

+[**--cpu-quota**[=*0*]]

 [**--cpuset-cpus**[=*CPUSET-CPUS*]]

 [**--cpuset-mems**[=*CPUSET-MEMS*]]

 [**-d**|**--detach**[=*false*]]

-[**--cpu-quota**[=*0*]]

 [**--device**[=*[]*]]

-[**--dns-search**[=*[]*]]

 [**--dns**[=*[]*]]

+[**--dns-search**[=*[]*]]

 [**-e**|**--env**[=*[]*]]

 [**--entrypoint**[=*ENTRYPOINT*]]

 [**--env-file**[=*[]*]]

@@ -33,32 +34,32 @@ docker-run - Run a command in a new container

 [**-l**|**--label**[=*[]*]]

 [**--label-file**[=*[]*]]

 [**--link**[=*[]*]]

-[**--lxc-conf**[=*[]*]]

 [**--log-driver**[=*[]*]]

 [**--log-opt**[=*[]*]]

+[**--lxc-conf**[=*[]*]]

 [**-m**|**--memory**[=*MEMORY*]]

-[**--memory-swap**[=*MEMORY-SWAP*]]

 [**--mac-address**[=*MAC-ADDRESS*]]

+[**--memory-swap**[=*MEMORY-SWAP*]]

+[**--memory-swappiness**[=*MEMORY-SWAPPINESS*]]

 [**--name**[=*NAME*]]

 [**--net**[=*"bridge"*]]

 [**--oom-kill-disable**[=*false*]]

 [**-P**|**--publish-all**[=*false*]]

 [**-p**|**--publish**[=*[]*]]

 [**--pid**[=*[]*]]

-[**--uts**[=*[]*]]

 [**--privileged**[=*false*]]

 [**--read-only**[=*false*]]

 [**--restart**[=*RESTART*]]

 [**--rm**[=*false*]]

 [**--security-opt**[=*[]*]]

 [**--sig-proxy**[=*true*]]

-[**--memory-swappiness**[=*MEMORY-SWAPPINESS*]]

 [**-t**|**--tty**[=*false*]]

 [**-u**|**--user**[=*USER*]]

 [**-v**|**--volume**[=*[]*]]

+[**--ulimit**[=*[]*]]

+[**--uts**[=*[]*]]

 [**--volumes-from**[=*[]*]]

 [**-w**|**--workdir**[=*WORKDIR*]]

-[**--cgroup-parent**[=*CGROUP-PATH*]]

 IMAGE [COMMAND] [ARG...]

 # DESCRIPTION

@@ -397,6 +398,9 @@ standard input.

    Without this argument the command will be run as root in the container.

+""--ulimit""=[]

+    Ulimit options

+

 **-v**, **--volume**=[]

    Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container)

@@ -83,9 +83,9 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe

 		flWorkingDir      = cmd.String([]string{"w", "-workdir"}, "", "Working directory inside the container")

 		flCpuShares       = cmd.Int64([]string{"c", "-cpu-shares"}, 0, "CPU shares (relative weight)")

 		flCpuPeriod       = cmd.Int64([]string{"-cpu-period"}, 0, "Limit CPU CFS (Completely Fair Scheduler) period")

+		flCpuQuota        = cmd.Int64([]string{"-cpu-quota"}, 0, "Limit CPU CFS (Completely Fair Scheduler) quota")

 		flCpusetCpus      = cmd.String([]string{"#-cpuset", "-cpuset-cpus"}, "", "CPUs in which to allow execution (0-3, 0,1)")

 		flCpusetMems      = cmd.String([]string{"-cpuset-mems"}, "", "MEMs in which to allow execution (0-3, 0,1)")

-		flCpuQuota        = cmd.Int64([]string{"-cpu-quota"}, 0, "Limit the CPU CFS quota")

 		flBlkioWeight     = cmd.Int64([]string{"-blkio-weight"}, 0, "Block IO (relative weight), between 10 and 1000")

 		flNetMode         = cmd.String([]string{"-net"}, "default", "Set the Network mode for the container")

 		flMacAddress      = cmd.String([]string{"-mac-address"}, "", "Container MAC address (e.g. 92:d0:c6:0a:29:33)")