Merge pull request docker#18855 from rhatdan/volume-tmpfs

No options to tmpfs is valid
alexmavr · Dec 22, 2015 · 9c89e83 · 9c89e83
2 parents 81c8e4d + 89a775d
commit 9c89e83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go
@@ -479,6 +479,9 @@ func (s *DockerSuite) TestRunTmpfsMounts(c *check.C) {
 	if out, _, err := dockerCmdWithError("run", "--tmpfs", "/run", "busybox", "touch", "/run/somefile"); err != nil {
 		c.Fatalf("/run directory not mounted on tmpfs %q %s", err, out)
 	}
+	if out, _, err := dockerCmdWithError("run", "--tmpfs", "/run:noexec", "busybox", "touch", "/run/somefile"); err != nil {
+		c.Fatalf("/run directory not mounted on tmpfs %q %s", err, out)
+	}
 	if out, _, err := dockerCmdWithError("run", "--tmpfs", "/run:noexec,nosuid,rw,size=5k,mode=700", "busybox", "touch", "/run/somefile"); err != nil {
 		c.Fatalf("/run failed to mount on tmpfs with valid options %q %s", err, out)
 	}

diff --git a/pkg/mount/flags.go b/pkg/mount/flags.go
@@ -73,6 +73,7 @@ func parseOptions(options string) (int, string) {
 func ParseTmpfsOptions(options string) (int, string, error) {
 	flags, data := parseOptions(options)
 	validFlags := map[string]bool{
+		"":          true,
 		"size":      true,
 		"mode":      true,
 		"uid":       true,