From 3fcf53db920de9d9111a86bd0eda90a059885754 Mon Sep 17 00:00:00 2001
From: Doug Davis <dug@us.ibm.com>
Date: Fri, 5 Jun 2015 12:42:48 -0700
Subject: [PATCH] Minor doc edit to add clarity around the --volume path format
Also add a comment to the ValidatePath func so devs/reviewers know exactly
what its looking for.
Signed-off-by: Doug Davis <dug@us.ibm.com>
---
docs/sources/reference/run.md | 6 ++++--
opts/opts.go | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/docs/sources/reference/run.md b/docs/sources/reference/run.md
index 1f75b87c4c..a14a6084d3 100644
--- a/docs/sources/reference/run.md
+++ b/docs/sources/reference/run.md
@@ -1122,8 +1122,10 @@ container's `/etc/hosts` entry will be automatically updated.
## VOLUME (shared filesystems)
- -v=[]: Create a bind mount with: [host-dir]:[container-dir]:[rw|ro].
- If "container-dir" is missing, then docker creates a new volume.
+ -v=[]: Create a bind mount with: [host-dir:]container-dir[:rw|ro].
+ 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)
The volumes commands are complex enough to have their own documentation
diff --git a/opts/opts.go b/opts/opts.go
index 8dcc8c5988..e40c1a334a 100644
--- a/opts/opts.go
+++ b/opts/opts.go
@@ -193,6 +193,8 @@ func ValidateLink(val string) (string, error) {
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) {
var containerPath string