Merge pull request #15602 from Microsoft/10662-blockfromscratch

Windows: Block 'FROM scratch'
Upstream-commit: a6e0a6852dbfaa29ec76e9fcfd1bd7f9c499afbe
Component: engine

components/engine/builder/dispatchers.go

@@ -194,7 +194,11 @@ func from(b *builder, args []string, attributes map[string]bool, original string
 
 	name := args[0]
 
+	// Windows cannot support a container with no base image.
 	if name == NoBaseImageSpecifier {
+		if runtime.GOOS == "windows" {
+			return fmt.Errorf("Windows does not support FROM scratch")
+		}
 		b.image = ""
 		b.noBaseImage = true
 		return nil