@@ -227,6 +227,13 @@ func (cli *DockerCli) CmdBuild(args ...string) error {

 			return err

 		}

 	}

+

+	// windows: show error message about modified file permissions

+	// FIXME: this is not a valid warning when the daemon is running windows. should be removed once docker engine for windows can build.

+	if runtime.GOOS == "windows" {

+		log.Warn(`SECURITY WARNING: You are building a Docker image from Windows against a Linux Docker host. All files and directories added to build context will have '-rwxr-xr-x' permissions. It is recommended to double check and reset permissions for sensitive files and directories.`)

+	}

+

 	var body io.Reader

 	// Setup an upload progress bar

 	// FIXME: ProgressReader shouldn't be this annoying to use

@@ -4551,8 +4551,19 @@ func TestBuildStderr(t *testing.T) {

 	if err != nil {

 		t.Fatal(err)

 	}

-	if stderr != "" {

-		t.Fatalf("Stderr should have been empty, instead its: %q", stderr)

+

+	if runtime.GOOS == "windows" {

+		// stderr might contain a security warning on windows

+		lines := strings.Split(stderr, "\n")

+		for _, v := range lines {

+			if v != "" && !strings.Contains(v, "SECURITY WARNING:") {

+				t.Fatalf("Stderr contains unexpected output line: %q", v)

+			}

+		}

+	} else {

+		if stderr != "" {

+			t.Fatalf("Stderr should have been empty, instead its: %q", stderr)

+		}

 	}

 	logDone("build - testing stderr")

 }