system: add back lcow validation function

Signed-off-by: Tonis Tiigi <[email protected]>

api/server/router/build/build_routes.go

@@ -24,6 +24,7 @@ import (
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/docker/docker/pkg/system"
 	"github.com/docker/go-units"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -77,6 +78,9 @@ func newImageBuildOptions(ctx context.Context, r *http.Request) (*types.ImageBui
 			if err != nil {
 				return nil, err
 			}
+			if err := system.ValidatePlatform(sp); err != nil {
+				return nil, err
+			}
 			options.Platform = &sp
 		}
 	}

api/server/router/image/image_routes.go

@@ -16,6 +16,7 @@ import (
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/streamformatter"
+	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/registry"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
@@ -49,6 +50,9 @@ func (s *imageRouter) postImagesCreate(ctx context.Context, w http.ResponseWrite
 			if err != nil {
 				return err
 			}
+			if err := system.ValidatePlatform(sp); err != nil {
+				return err
+			}
 			platform = &sp
 		}
 	}

builder/dockerfile/dispatchers.go

@@ -165,6 +165,9 @@ func initializeStage(d dispatchRequest, cmd *instructions.Stage) error {
 		if err != nil {
 			return errors.Wrapf(err, "failed to parse platform %s", v)
 		}
+		if err := system.ValidatePlatform(p); err != nil {
+			return err
+		}
 		platform = &p
 	}
 

image/tarexport/load.go

@@ -11,6 +11,7 @@ import (
 	"reflect"
 	"runtime"
 
+	"github.com/containerd/containerd/platforms"
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/reference"
 	"github.com/docker/docker/image"
@@ -421,7 +422,11 @@ func checkCompatibleOS(imageOS string) error {
 	if runtime.GOOS != "windows" && imageOS == "windows" {
 		return fmt.Errorf("cannot load %s image on %s", imageOS, runtime.GOOS)
 	}
-	// Finally, check the image OS is supported for the platform.
-	// TODO(@arm64b): Leave this sanity check to the containerd code in the future
-	return nil
+
+	p, err := platforms.Parse(imageOS)
+	if err != nil {
+		return err
+	}
+
+	return system.ValidatePlatform(p)
 }

pkg/system/lcow.go

@@ -3,6 +3,9 @@ package system // import "github.com/docker/docker/pkg/system"
 import (
 	"runtime"
 	"strings"
+
+	specs "github.com/opencontainers/image-spec/specs-go/v1"
+	"github.com/pkg/errors"
 )
 
 // IsOSSupported determines if an operating system is supported by the host
@@ -15,3 +18,15 @@ func IsOSSupported(os string) bool {
 	}
 	return false
 }
+
+// ValidatePlatform determines if a platform structure is valid.
+// TODO This is a temporary windows-only function, should be replaced by
+// comparison of worker capabilities
+func ValidatePlatform(platform specs.Platform) error {
+	if runtime.GOOS == "windows" {
+		if !(platform.OS == runtime.GOOS || (LCOWSupported() && platform.OS == "linux")) {
+			return errors.Errorf("unsupported os %s", platform.OS)
+		}
+	}
+	return nil
+}