浏览代码

Adding the new options to the `docker ps` documentation.

URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding the new options to the `docker ps` documentation.

URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

Adding CLI options to the commandline reference documentation.

URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)

changing indention

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Scott Collier 11 年之前
父节点
当前提交
baa70e9751
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      docs/sources/reference/commandline/cli.rst

+ 5 - 0
docs/sources/reference/commandline/cli.rst

@@ -80,7 +80,9 @@ Commands
       -g, --graph="/var/lib/docker": Path to use as the root of the docker runtime
       -g, --graph="/var/lib/docker": Path to use as the root of the docker runtime
       --icc=true: Enable inter-container communication
       --icc=true: Enable inter-container communication
       --ip="0.0.0.0": Default IP address to use when binding container ports
       --ip="0.0.0.0": Default IP address to use when binding container ports
+      --ip-forward=true: Disable enabling of net.ipv4.ip_forward
       --iptables=true: Disable docker's addition of iptables rules
       --iptables=true: Disable docker's addition of iptables rules
+      --mtu=0: Set the containers network MTU; if no value is provided: default to the default route MTU or 1500 if not default route is available
       -p, --pidfile="/var/run/docker.pid": Path to use for daemon PID file
       -p, --pidfile="/var/run/docker.pid": Path to use for daemon PID file
       -r, --restart=true: Restart previously running containers
       -r, --restart=true: Restart previously running containers
       -s, --storage-driver="": Force the docker runtime to use a specific storage driver
       -s, --storage-driver="": Force the docker runtime to use a specific storage driver
@@ -967,6 +969,8 @@ The last container is marked as a ``Ghost`` container. It is a container that wa
 
 
     Pull an image or a repository from the registry
     Pull an image or a repository from the registry
 
 
+      -t, --tag="": Download tagged image in repository
+
 
 
 .. _cli_push:
 .. _cli_push:
 
 
@@ -1005,6 +1009,7 @@ The last container is marked as a ``Ghost`` container. It is a container that wa
     Remove one or more containers
     Remove one or more containers
         -l, --link="": Remove the link instead of the actual container
         -l, --link="": Remove the link instead of the actual container
         -f, --force=false: Force removal of running container
         -f, --force=false: Force removal of running container
+        -v, --volumes=false: Remove the volumes associated to the container
 
 
 Known Issues (rm)
 Known Issues (rm)
 ~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~