Merge pull request #13776 from duglin/MinorVolDocEdit

Minor doc edit to add clarity around the --volume path format
This commit is contained in:
moxiegirl 2015-06-05 18:41:37 -07:00
commit ffd74e74b1
2 changed files with 6 additions and 2 deletions

View File

@ -1122,8 +1122,10 @@ container's `/etc/hosts` entry will be automatically updated.
## VOLUME (shared filesystems) ## VOLUME (shared filesystems)
-v=[]: Create a bind mount with: [host-dir]:[container-dir]:[rw|ro]. -v=[]: Create a bind mount with: [host-dir:]container-dir[:rw|ro].
If "container-dir" is missing, then docker creates a new volume. If 'host-dir' is missing, then docker creates a new volume.
If neither 'rw' or 'ro' is specified then the volume is mounted
in read-write mode.
--volumes-from="": Mount all volumes from the given container(s) --volumes-from="": Mount all volumes from the given container(s)
The volumes commands are complex enough to have their own documentation The volumes commands are complex enough to have their own documentation

View File

@ -193,6 +193,8 @@ func ValidateLink(val string) (string, error) {
return val, nil return val, nil
} }
// ValidatePath will make sure 'val' is in the form:
// [host-dir:]container-path[:rw|ro] - but doesn't validate the mode part
func ValidatePath(val string) (string, error) { func ValidatePath(val string) (string, error) {
var containerPath string var containerPath string