Преглед изворни кода

Windows: Allow user in builder

Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit a3c4ab9b657018cf6fc33e70a44c790563c16043)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
John Howard пре 8 година
родитељ
комит
530b7cb4a0
2 измењених фајлова са 18 додато и 1 уклоњено
  1. 1 1
      builder/dockerfile/evaluator_windows.go
  2. 17 0
      integration-cli/docker_cli_build_test.go

+ 1 - 1
builder/dockerfile/evaluator_windows.go

@@ -6,7 +6,7 @@ import "fmt"
 // a command not supported on the platform.
 func platformSupports(command string) error {
 	switch command {
-	case "user", "stopsignal":
+	case "stopsignal":
 		return fmt.Errorf("The daemon on this platform does not support the command '%s'", command)
 	}
 	return nil

+ 17 - 0
integration-cli/docker_cli_build_test.go

@@ -7266,3 +7266,20 @@ func (s *DockerSuite) TestBuildOpaqueDirectory(c *check.C) {
 	_, err := buildImage("testopaquedirectory", dockerFile, false)
 	c.Assert(err, checker.IsNil)
 }
+
+// Windows test for USER in dockerfile
+func (s *DockerSuite) TestBuildWindowsUser(c *check.C) {
+	testRequires(c, DaemonIsWindows)
+	name := "testbuildwindowsuser"
+	_, out, err := buildImageWithOut(name,
+		`FROM `+WindowsBaseImage+`
+		RUN net user user /add
+		USER user
+		RUN set username
+		`,
+		true)
+	if err != nil {
+		c.Fatal(err)
+	}
+	c.Assert(strings.ToLower(out), checker.Contains, "username=user")
+}