Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update the docs to reflect the nice \n handling 

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
This commit is contained in:
Sven Dowideit 2014-05-07 09:40:49 +10:00 committed by Tibor Vass
parent 35c4f1426e
commit cbdde9c15a
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
docs/sources/reference/commandline/cli.md
View File

@ -809,33 +809,39 @@ Run a command in a new container
Usage: docker run [OPTIONS] IMAGE[:TAG] [COMMAND] [ARG...] Usage: docker run [OPTIONS] IMAGE[:TAG] [COMMAND] [ARG...]
-a, --attach=[]: Attach to stdin, stdout or stderr. -a, --attach=[] Attach to stdin, stdout or stderr.
-c, --cpu-shares=0: CPU shares (relative weight) -c, --cpu-shares=0 CPU shares (relative weight)
--cidfile="": Write the container ID to the file --cidfile="" Write the container ID to the file
-d, --detach=false: Detached mode: Run container in the background, print new container id -d, --detach=false Detached mode: Run container in the background, print new container id
--dns=[]: Set custom dns servers --dns=[] Set custom dns servers
--dns-search=[]: Set custom dns search domains --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 ENV variables --env-file=[] Read in a line delimited file of ENV variables
--expose=[]: Expose a port from the container without publishing it to your host --expose=[] Expose a port from the container without publishing it to your host
-h, --hostname="": Container host name -h, --hostname="" Container host name
-i, --interactive=false: Keep stdin open even if not attached -i, --interactive=false Keep stdin open even if not attached
--link=[]: Add link to another container (name:alias) --link=[] Add link to another container (name:alias)
--lxc-conf=[]: (lxc exec-driver only) Add custom lxc options --lxc-conf="lxc.cgroup.cpuset.cpus = 0,1" --lxc-conf=[] (lxc exec-driver only) Add custom lxc options --lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"
-m, --memory="": Memory limit (format: <number><optional unit>, where unit = b, k, m or g) -m, --memory="" Memory limit (format: <number><optional unit>, where unit = b, k, m or g)
--name="": Assign a name to the container --name="" Assign a name to the container
--net="bridge": Set the Network mode for the container ('bridge': creates a new network stack for the container on the docker bridge, 'none': no networking for this container, 'container:<name|id>': reuses another container network stack), 'host': use the host network stack inside the container --net="bridge" Set the Network mode for the container
-P, --publish-all=false: Publish all exposed ports to the host interfaces 'bridge': creates a new network stack for the container on the docker bridge
-p, --publish=[]: Publish a container's port to the host (format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort) (use 'docker port' to see the actual mapping) 'none': no networking for this container
--privileged=false: Give extended privileges to this container 'container:<name|id>': reuses another container network stack
--rm=false: Automatically remove the container when it exits (incompatible with -d) 'host': use the host network stack inside the contaner
--sig-proxy=true: Proxify all received signal to the process (even in non-tty mode) -p, --publish=[] Publish a container's port to the host
-t, --tty=false: Allocate a pseudo-tty format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort
-u, --user="": Username or UID (use 'docker port' to see the actual mapping)
-v, --volume=[]: Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container) -P, --publish-all=false Publish all exposed ports to the host interfaces
--volumes-from=[]: Mount volumes from the specified container(s) --privileged=false Give extended privileges to this container
-w, --workdir="": Working directory inside the container --rm=false Automatically remove the container when it exits (incompatible with -d)
--sig-proxy=true Proxify all received signal to the process (even in non-tty mode)
-t, --tty=false Allocate a pseudo-tty
-u, --user="" Username or UID
-v, --volume=[] Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)
--volumes-from=[] Mount volumes from the specified container(s)
-w, --workdir="" Working directory inside the container
The `docker run` command first `creates` a writeable container layer over the The `docker run` command first `creates` a writeable container layer over the
specified image, and then `starts` it using the specified command. That is, specified image, and then `starts` it using the specified command. That is,

5
docs/sources/reference/run.md
View File

@ -138,6 +138,11 @@ PID files):
--dns=[] : Set custom dns servers for the container --dns=[] : Set custom dns servers 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, 'none': no networking for this container, 'container:<name|id>': reuses another container network stack), 'host': use the host network stack inside the container --net="bridge": Set the Network mode for the container ('bridge': creates a new network stack for the container on the docker bridge, 'none': no networking for this container, 'container:<name|id>': reuses another container network stack), 'host': use the host network stack inside the container
--net="bridge" Set the Network mode for the container
'bridge': creates a new network stack for the container on the docker bridge
'none': no networking for this container
'container:<name|id>': reuses another container network stack
'host': use the host network stack inside the contaner
By default, all containers have networking enabled and they can make any By default, all containers have networking enabled and they can make any
outgoing connections. The operator can completely disable networking outgoing connections. The operator can completely disable networking