Browse code

Merge pull request #9920 from SvenDowideit/publish-all-maps-to-random-ports

Explicitly mention that '-P' maps to random ports

Jessie Frazelle authored on 2015/01/07 02:39:50
Showing 5 changed files
... ...
@@ -122,7 +122,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l lxc-conf -d
122 122
 complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s m -l memory -d 'Memory limit (format: <number><optional unit>, where unit = b, k, m or g)'
123 123
 complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l name -d 'Assign a name to the container'
124 124
 complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l net -d 'Set the Network mode for the container'
125
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s P -l publish-all -d 'Publish all exposed ports to the host interfaces'
125
+complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s P -l publish-all -d 'Publish all exposed ports to random ports on the host interfaces'
126 126
 complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s p -l publish -d "Publish a container's port to the host"
127 127
 complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l privileged -d 'Give extended privileges to this container'
128 128
 complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l restart -d 'Restart policy to apply when a container exits (no, on-failure[:max-retry], always)'
... ...
@@ -278,7 +278,7 @@ complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l lxc-conf -d '(l
278 278
 complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s m -l memory -d 'Memory limit (format: <number><optional unit>, where unit = b, k, m or g)'
279 279
 complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l name -d 'Assign a name to the container'
280 280
 complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l net -d 'Set the Network mode for the container'
281
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s P -l publish-all -d 'Publish all exposed ports to the host interfaces'
281
+complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s P -l publish-all -d 'Publish all exposed ports to random ports on the host interfaces'
282 282
 complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s p -l publish -d "Publish a container's port to the host"
283 283
 complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l privileged -d 'Give extended privileges to this container'
284 284
 complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l restart -d 'Restart policy to apply when a container exits (no, on-failure[:max-retry], always)'
... ...
@@ -122,7 +122,7 @@ IMAGE [COMMAND] [ARG...]
122 122
                                '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.
123 123
 
124 124
 **-P**, **--publish-all**=*true*|*false*
125
-   Publish all exposed ports to the host interfaces. The default is *false*.
125
+   Publish all exposed ports to random ports on the host interfaces. The default is *false*.
126 126
 
127 127
 **-p**, **--publish**=[]
128 128
    Publish a container's port, or a range of ports, to the host
... ...
@@ -218,7 +218,7 @@ and foreground Docker containers.
218 218
                                '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.
219 219
 
220 220
 **-P**, **--publish-all**=*true*|*false*
221
-   Publish all exposed ports to the host interfaces. The default is *false*.
221
+   Publish all exposed ports to random ports on the host interfaces. The default is *false*.
222 222
 
223 223
    When set to true publish all exposed ports to the host interfaces. The
224 224
 default is false. If the operator uses -P (or -p) then Docker will make the
... ...
@@ -698,7 +698,7 @@ Creates a new container.
698 698
                                    'none': no networking for this container
699 699
                                    'container:<name|id>': reuses another container network stack
700 700
                                    '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.
701
-      -P, --publish-all=false    Publish all exposed ports to the host interfaces
701
+      -P, --publish-all=false    Publish all exposed ports to random ports on the host interfaces
702 702
       -p, --publish=[]           Publish a container's port, or a range of ports (e.g., `-p 3300-3310`), to the host
703 703
                                    format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort
704 704
                                    Both hostPort and containerPort can be specified as a range of ports. 
... ...
@@ -1526,7 +1526,7 @@ removed before the image is removed.
1526 1526
                                    'none': no networking for this container
1527 1527
                                    'container:<name|id>': reuses another container network stack
1528 1528
                                    '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.
1529
-      -P, --publish-all=false    Publish all exposed ports to the host interfaces
1529
+      -P, --publish-all=false    Publish all exposed ports to random ports on the host interfaces
1530 1530
       -p, --publish=[]           Publish a container's port to the host
1531 1531
                                    format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort
1532 1532
                                    Both hostPort and containerPort can be specified as a range of ports. 
... ...
@@ -46,7 +46,7 @@ func Parse(cmd *flag.FlagSet, args []string) (*Config, *HostConfig, *flag.FlagSe
46 46
 
47 47
 		flNetwork         = cmd.Bool([]string{"#n", "#-networking"}, true, "Enable networking for this container")
48 48
 		flPrivileged      = cmd.Bool([]string{"#privileged", "-privileged"}, false, "Give extended privileges to this container")
49
-		flPublishAll      = cmd.Bool([]string{"P", "-publish-all"}, false, "Publish all exposed ports to the host interfaces")
49
+		flPublishAll      = cmd.Bool([]string{"P", "-publish-all"}, false, "Publish all exposed ports to random ports on the host interfaces")
50 50
 		flStdin           = cmd.Bool([]string{"i", "-interactive"}, false, "Keep STDIN open even if not attached")
51 51
 		flTty             = cmd.Bool([]string{"t", "-tty"}, false, "Allocate a pseudo-TTY")
52 52
 		flContainerIDFile = cmd.String([]string{"#cidfile", "-cidfile"}, "", "Write the container ID to the file")