Browse code

Cleanup: correct cli --volumes-from description

issue #7580 volumes-from comma separated list mentioned this case.

Options like --volumes-from=[] indicate they can be specified multiple times:
docker run -it --rm --volumes-from TEST_DATA --volumes-from TEST_DATA2 ubuntu bash

Signed-off-by: Deshi Xiao <dxiao@redhat.com>

Deshi Xiao authored on 2014/08/20 16:56:50
Showing 1 changed files
... ...
@@ -322,7 +322,7 @@ schema.
322 322
 
323 323
 > **Note:** `docker build` will return a `no such file or directory` error
324 324
 > if the file or directory does not exist in the uploaded context. This may
325
-> happen if there is no context, or if you specify a file that is elsewhere 
325
+> happen if there is no context, or if you specify a file that is elsewhere
326 326
 > on the Host system. The context is limited to the current directory (and its
327 327
 > children) for security reasons, and to ensure repeatable builds on remote
328 328
 > Docker hosts. This is also the reason why `ADD ../file` will not work.
... ...
@@ -824,8 +824,8 @@ Current filters:
824 824
 
825 825
     $ sudo docker ps -a --filter 'exited=0'
826 826
     CONTAINER ID        IMAGE             COMMAND                CREATED             STATUS                   PORTS                      NAMES
827
-    ea09c3c82f6e        registry:latest   /srv/run.sh            2 weeks ago         Exited (0) 2 weeks ago   127.0.0.1:5000->5000/tcp   desperate_leakey       
828
-    106ea823fe4e        fedora:latest     /bin/sh -c 'bash -l'   2 weeks ago         Exited (0) 2 weeks ago                              determined_albattani   
827
+    ea09c3c82f6e        registry:latest   /srv/run.sh            2 weeks ago         Exited (0) 2 weeks ago   127.0.0.1:5000->5000/tcp   desperate_leakey
828
+    106ea823fe4e        fedora:latest     /bin/sh -c 'bash -l'   2 weeks ago         Exited (0) 2 weeks ago                              determined_albattani
829 829
     48ee228c9464        fedora:20         bash                   2 weeks ago         Exited (0) 2 weeks ago                              tender_torvalds
830 830
 
831 831
 This shows all the containers that have exited with status of '0'
... ...
@@ -1145,14 +1145,14 @@ network and environment of the `redis` container via environment variables.
1145 1145
 The `--name` flag will assign the name `console` to the newly created
1146 1146
 container.
1147 1147
 
1148
-    $ sudo docker run --volumes-from 777f7dc92da7,ba8c0c54f0f2:ro -i -t ubuntu pwd
1148
+    $ sudo docker run --volumes-from 777f7dc92da7 --volumes-from ba8c0c54f0f2:ro -i -t ubuntu pwd
1149 1149
 
1150 1150
 The `--volumes-from` flag mounts all the defined volumes from the referenced
1151
-containers. Containers can be specified by a comma separated list or by
1152
-repetitions of the `--volumes-from` argument. The container ID may be
1153
-optionally suffixed with `:ro` or `:rw` to mount the volumes in read-only
1154
-or read-write mode, respectively. By default, the volumes are mounted in
1155
-the same mode (read write or read only) as the reference container.
1151
+containers. Containers can be specified by repetitions of the `--volumes-from`
1152
+argument. The container ID may be optionally suffixed with `:ro` or `:rw` to
1153
+mount the volumes in read-only or read-write mode, respectively. By default,
1154
+the volumes are mounted in the same mode (read write or read only) as
1155
+the reference container.
1156 1156
 
1157 1157
 The `-a` flag tells `docker run` to bind to the container's `STDIN`, `STDOUT` or
1158 1158
 `STDERR`. This makes it possible to manipulate the output and input as needed.
... ...
@@ -1223,7 +1223,7 @@ application change:
1223 1223
 
1224 1224
 #### Restart Policies
1225 1225
 
1226
-Using the `--restart` flag on Docker run you can specify a restart policy for 
1226
+Using the `--restart` flag on Docker run you can specify a restart policy for
1227 1227
 how a container should or should not be restarted on exit.
1228 1228
 
1229 1229
 ** no ** - Do not restart the container when it exits.
... ...
@@ -1232,18 +1232,18 @@ how a container should or should not be restarted on exit.
1232 1232
 
1233 1233
 ** always ** - Always restart the container reguardless of the exit status.
1234 1234
 
1235
-You can also specify the maximum amount of times Docker will try to restart the 
1235
+You can also specify the maximum amount of times Docker will try to restart the
1236 1236
 container when using the ** on-failure ** policy.  The default is that Docker will try forever to restart the container.
1237 1237
 
1238 1238
     $ sudo docker run --restart=always redis
1239 1239
 
1240
-This will run the `redis` container with a restart policy of ** always ** so that if 
1240
+This will run the `redis` container with a restart policy of ** always ** so that if
1241 1241
 the container exits, Docker will restart it.
1242 1242
 
1243 1243
     $ sudo docker run --restart=on-failure:10 redis
1244 1244
 
1245
-This will run the `redis` container with a restart policy of ** on-failure ** and a 
1246
-maximum restart count of 10.  If the `redis` container exits with a non-zero exit 
1245
+This will run the `redis` container with a restart policy of ** on-failure ** and a
1246
+maximum restart count of 10.  If the `redis` container exits with a non-zero exit
1247 1247
 status more than 10 times in a row Docker will abort trying to restart the container.
1248 1248
 
1249 1249
 ## save
... ...
@@ -1294,7 +1294,7 @@ more details on finding shared images from the command line.
1294 1294
       -a, --attach=false         Attach container's STDOUT and STDERR and forward all signals to the process
1295 1295
       -i, --interactive=false    Attach container's STDIN
1296 1296
 
1297
-When run on a container that has already been started, 
1297
+When run on a container that has already been started,
1298 1298
 takes no action and succeeds unconditionally.
1299 1299
 
1300 1300
 ## stop