From e4d2a8231a53794c2b5b28ccf63125a85749e648 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 9 Sep 2014 11:16:02 +1000 Subject: [PATCH] add -p PORT as a valid format specification Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) --- docs/man/docker-run.1.md | 2 +- docs/sources/reference/commandline/cli.md | 2 +- docs/sources/reference/run.md | 2 +- nat/nat.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/man/docker-run.1.md b/docs/man/docker-run.1.md index 225fb78cb8..953acf5897 100644 --- a/docs/man/docker-run.1.md +++ b/docs/man/docker-run.1.md @@ -186,7 +186,7 @@ exposed ports, use **docker port**. **-p**, **--publish**=[] Publish a container's port to the host (format: ip:hostPort:containerPort | -ip::containerPort | hostPort:containerPort) (use **docker port** to see the +ip::containerPort | hostPort:containerPort | containerPort) (use **docker port** to see the actual mapping) **--privileged**=*true*|*false* diff --git a/docs/sources/reference/commandline/cli.md b/docs/sources/reference/commandline/cli.md index c8edc11d0a..714116ddc5 100644 --- a/docs/sources/reference/commandline/cli.md +++ b/docs/sources/reference/commandline/cli.md @@ -1010,7 +1010,7 @@ removed before the image is removed. '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 the host interfaces -p, --publish=[] Publish a container's port to the host - format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort + format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort (use 'docker port' to see the actual mapping) --privileged=false Give extended privileges to this container --restart="" Restart policy to apply when a container exits (no, on-failure[:max-retry], always) diff --git a/docs/sources/reference/run.md b/docs/sources/reference/run.md index 1b56c74299..085c250d70 100644 --- a/docs/sources/reference/run.md +++ b/docs/sources/reference/run.md @@ -345,7 +345,7 @@ or override the Dockerfile's exposed defaults: -P=false : Publish all exposed ports to the host interfaces -p=[] : Publish a container᾿s port to the host (format: ip:hostPort:containerPort | ip::containerPort | - hostPort:containerPort) + hostPort:containerPort | containerPort) (use 'docker port' to see the actual mapping) --link="" : Add link to another container (name:alias) diff --git a/nat/nat.go b/nat/nat.go index a2ad9083d0..3624eef729 100644 --- a/nat/nat.go +++ b/nat/nat.go @@ -14,7 +14,7 @@ import ( const ( PortSpecTemplate = "ip:hostPort:containerPort" - PortSpecTemplateFormat = "ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort" + PortSpecTemplateFormat = "ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort" ) type PortBinding struct {