Browse Source

Re-arrange volume_driver in compose file reference.

Signed-off-by: Daniel Nephin <[email protected]>
Daniel Nephin 10 years ago
parent
commit
01f44efe0d
1 changed files with 12 additions and 4 deletions
  1. 12 4
      docs/yml.md

+ 12 - 4
docs/yml.md

@@ -334,7 +334,7 @@ Override the default labeling scheme for each container.
         - label:user:USER
         - label:user:USER
         - label:role:ROLE
         - label:role:ROLE
 
 
-### volumes
+### volumes, volume\_driver
 
 
 Mount paths as volumes, optionally specifying a path on the host machine
 Mount paths as volumes, optionally specifying a path on the host machine
 (`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
 (`HOST:CONTAINER`), or an access mode (`HOST:CONTAINER:ro`).
@@ -348,9 +348,19 @@ You can mount a relative path on the host, which will expand relative to
 the directory of the Compose configuration file being used. Relative paths
 the directory of the Compose configuration file being used. Relative paths
 should always begin with `.` or `..`.
 should always begin with `.` or `..`.
 
 
+If you use a volume name (instead of a volume path), you may also specify
+a `volume_driver`.
+
+    volume_driver: mydriver
+
+
 > Note: No path expansion will be done if you have also specified a
 > Note: No path expansion will be done if you have also specified a
 > `volume_driver`.
 > `volume_driver`.
 
 
+See [Docker Volumes](https://docs.docker.com/userguide/dockervolumes/) and
+[Volume Plugins](https://docs.docker.com/extend/plugins_volume/) for more
+information.
+
 ### volumes_from
 ### volumes_from
 
 
 Mount all of the volumes from another service or container, optionally
 Mount all of the volumes from another service or container, optionally
@@ -361,7 +371,7 @@ specifying read-only access(``ro``) or read-write(``rw``).
      - container_name
      - container_name
      - service_name:rw
      - service_name:rw
 
 
-### cpu\_shares, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, volume\_driver, working\_dir
+### cpu\_shares, cpuset, domainname, entrypoint, hostname, ipc, mac\_address, mem\_limit, memswap\_limit, privileged, read\_only, restart, stdin\_open, tty, user, working\_dir
 
 
 Each of these is a single value, analogous to its
 Each of these is a single value, analogous to its
 [docker run](https://docs.docker.com/reference/run/) counterpart.
 [docker run](https://docs.docker.com/reference/run/) counterpart.
@@ -388,8 +398,6 @@ Each of these is a single value, analogous to its
     stdin_open: true
     stdin_open: true
     tty: true
     tty: true
 
 
-    volume_driver: mydriver
-
 ## Variable substitution
 ## Variable substitution
 
 
 Your configuration options can contain environment variables. Compose uses the
 Your configuration options can contain environment variables. Compose uses the