GitList

Browse code

No options to tmpfs is valid

If you run a

docker run command with --tmpfs /mountpoint:noexec

Or certain options that get translated into mount options, the mount command can get passed "" for mount data.
So this should be valid.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>

Dan Walsh authored on 2015/12/23 03:59:28
Showing 2 changed files

integration-cli/docker_cli_run_unix_test.go

History View file @ 89a775d

@@ -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)
+                     	}

pkg/mount/flags.go

History View file @ 89a775d

@@ -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,