Use newer help out for 'docker' and 'docker run'

Closes #10828

Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
Doug Davis 2015-02-16 08:43:09 -08:00 committed by Tibor Vass
parent e2ac0fc917
commit 3820b31267
1 changed files with 69 additions and 77 deletions

View File

@ -74,40 +74,41 @@ expect an integer, and they can only be specified once.
A self-sufficient runtime for linux containers. A self-sufficient runtime for linux containers.
Options: Options:
--api-enable-cors=false Enable CORS headers in the remote API --api-enable-cors=false Enable CORS headers in the remote API
-b, --bridge="" Attach containers to a network bridge -b, --bridge="" Attach containers to a network bridge
--bip="" Specify network bridge IP --bip="" Specify network bridge IP
-D, --debug=false Enable debug mode -D, --debug=false Enable debug mode
-d, --daemon=false Enable daemon mode -d, --daemon=false Enable daemon mode
--dns=[] DNS server to use --dns=[] DNS server to use
--dns-search=[] DNS search domains to use --dns-search=[] DNS search domains to use
-e, --exec-driver="native" Exec driver to use -e, --exec-driver="native" Exec driver to use
--fixed-cidr="" IPv4 subnet for fixed IPs --fixed-cidr="" IPv4 subnet for fixed IPs
--fixed-cidr-v6="" IPv6 subnet for fixed IPs --fixed-cidr-v6="" IPv6 subnet for fixed IPs
-G, --group="docker" Group for the unix socket -G, --group="docker" Group for the unix socket
-g, --graph="/var/lib/docker" Root of the Docker runtime -g, --graph="/var/lib/docker" Root of the Docker runtime
-H, --host=[] Daemon socket(s) to use or connect to -H, --host=[] Daemon socket(s) to use or connect to
--icc=true Enable inter-container communication -h, --help=false Print usage
--insecure-registry=[] Enable insecure registry communication --icc=true Enable inter-container communication
--ip=0.0.0.0 Default IP when binding container ports --insecure-registry=[] Enable insecure registry communication
--ip-forward=true Enable net.ipv4.ip_forward --ip=0.0.0.0 Default IP when binding container ports
--ip-masq=true Enable IP masquerading --ip-forward=true Enable net.ipv4.ip_forward
--iptables=true Enable addition of iptables rules --ip-masq=true Enable IP masquerading
--ipv6=false Enable IPv6 networking --iptables=true Enable addition of iptables rules
-l, --log-level="info" Set the logging level --ipv6=false Enable IPv6 networking
--label=[] Set key=value labels to the daemon -l, --log-level="info" Set the logging level
--mtu=0 Set the containers network MTU --label=[] Set key=value labels to the daemon
-p, --pidfile="/var/run/docker.pid" Path to use for daemon PID file --mtu=0 Set the containers network MTU
--registry-mirror=[] Preferred Docker registry mirror -p, --pidfile="/var/run/docker.pid" Path to use for daemon PID file
-s, --storage-driver="" Storage driver to use --registry-mirror=[] Preferred Docker registry mirror
--selinux-enabled=false Enable selinux support -s, --storage-driver="" Storage driver to use
--storage-opt=[] Set storage driver options --selinux-enabled=false Enable selinux support
--tls=false Use TLS; implied by --tlsverify flag --storage-opt=[] Set storage driver options
--tlscacert="/home/sven/.docker/ca.pem" Trust certs signed only by this CA --tls=false Use TLS; implied by --tlsverify flag
--tlscert="/home/sven/.docker/cert.pem" Path to TLS certificate file --tlscacert="~/.docker/ca.pem" Trust certs signed only by this CA
--tlskey="/home/sven/.docker/key.pem" Path to TLS key file --tlscert="~/.docker/cert.pem" Path to TLS certificate file
--tlsverify=false Use TLS and verify the remote --tlskey="~/.docker/key.pem" Path to TLS key file
-v, --version=false Print version information and quit --tlsverify=false Use TLS and verify the remote
-v, --version=false Print version information and quit
Options with [] may be specified multiple times. Options with [] may be specified multiple times.
@ -1602,45 +1603,36 @@ removed before the image is removed.
--cidfile="" Write the container ID to the file --cidfile="" Write the container ID to the file
--cpuset="" CPUs in which to allow execution (0-3, 0,1) --cpuset="" CPUs in which to allow execution (0-3, 0,1)
-d, --detach=false Run container in background and print container ID -d, --detach=false Run container in background and print container ID
--device=[] Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm) --device=[] Add a host device to the container
--dns=[] Set custom DNS servers --dns=[] Set custom DNS servers
--dns-search=[] Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain) --dns-search=[] Set custom DNS search domains
-e, --env=[] Set environment variables -e, --env=[] Set environment variables
--entrypoint="" Overwrite the default ENTRYPOINT of the image --entrypoint="" Overwrite the default ENTRYPOINT of the image
--env-file=[] Read in a line delimited file of environment variables --env-file=[] Read in a file of environment variables
--expose=[] Expose a port or a range of ports (e.g. --expose=3300-3310) from the container without publishing it to your host --expose=[] Expose a port or a range of ports
-h, --hostname="" Container host name -h, --hostname="" Container host name
--help=false Print usage
-i, --interactive=false Keep STDIN open even if not attached -i, --interactive=false Keep STDIN open even if not attached
--ipc="" Default is to create a private IPC namespace (POSIX SysV IPC) for the container --ipc="" IPC namespace to use
'container:<name|id>': reuses another container shared memory, semaphores and message queues --link=[] Add link to another container
'host': use the host shared memory,semaphores and message queues inside the container. Note: the host mode gives the container full access to local shared memory and is therefore considered insecure.
--link=[] Add link to another container in the form of name:alias
--lxc-conf=[] Add custom lxc options --lxc-conf=[] Add custom lxc options
-m, --memory="" Memory limit -m, --memory="" Memory limit
-memory-swap="" Total memory (memory+swap), '-1' to disable swap
--mac-address="" Container MAC address (e.g. 92:d0:c6:0a:29:33) --mac-address="" Container MAC address (e.g. 92:d0:c6:0a:29:33)
--memory-swap="" Total memory (memory + swap), '-1' to disable swap
--name="" Assign a name to the container --name="" Assign a name to the container
--net="bridge" Set the Network mode for the container --net="bridge" Set the Network mode for the container
'bridge': creates a new network stack for the container on the docker bridge -P, --publish-all=false Publish all exposed ports to random ports
'none': no networking for this container -p, --publish=[] Publish a container's port(s) to the host
'container:<name|id>': reuses another container network stack --pid="" PID namespace to use
'host': use the host network stack inside the container. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
-P, --publish-all=false Publish all exposed ports to random ports on the host interfaces
-p, --publish=[] Publish a container's port to the host
format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort
Both hostPort and containerPort can be specified as a range of ports.
When specifying ranges for both, the number of container ports in the range must match the number of host ports in the range. (e.g., `-p 1234-1236:1234-1236/tcp`)
(use 'docker port' to see the actual mapping)
--pid=host 'host': use the host PID namespace inside the container. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
--privileged=false Give extended privileges to this container --privileged=false Give extended privileges to this container
--read-only=false Mount the container's root filesystem as read only --read-only=false Mount the container's root filesystem as read only
--restart="" Restart policy to apply when a container exits (no, on-failure[:max-retry], always) --restart="" Restart policy to apply when a container exits
--rm=false Automatically remove the container when it exits --rm=false Automatically remove the container when it exits
--security-opt=[] Security Options --security-opt=[] Security Options
--sig-proxy=true Proxy received signals to the process --sig-proxy=true Proxy received signals to the process
-t, --tty=false Allocate a pseudo-TTY -t, --tty=false Allocate a pseudo-TTY
-u, --user="" Username or UID -u, --user="" Username or UID (format: <name|uid>[:<group|gid>])
-v, --volume=[] Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container) -v, --volume=[] Bind mount a volume
--volumes-from=[] Mount volumes from the specified container(s) --volumes-from=[] Mount volumes from the specified container(s)
-w, --workdir="" Working directory inside the container -w, --workdir="" Working directory inside the container