Check the validity of the platforms

platforms can still be added but some warning message will be emitted if the platform cannot pass the validity check. Signed-off-by: Dave Chen <dave.chen@arm.com>
moby · Mar 14, 2019 · a53fa2d · a53fa2d
1 parent c354108
commit a53fa2d
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 0 deletions.
diff --git a/cmd/buildkitd/main.go b/cmd/buildkitd/main.go
@@ -310,9 +310,19 @@ func setDefaultConfig(cfg *config.Config) {
 
 	if cfg.Workers.OCI.Platforms == nil {
 		cfg.Workers.OCI.Platforms = binfmt_misc.SupportedPlatforms()
+	} else {
+		supported := binfmt_misc.ValidatePlatforms(cfg.Workers.OCI.Platforms)
+		if !supported {
+			logrus.Warn("provided platforms cannot pass the validation, please check the configuration on the 'binfmt_misc'")
+		}
 	}
 	if cfg.Workers.Containerd.Platforms == nil {
 		cfg.Workers.Containerd.Platforms = binfmt_misc.SupportedPlatforms()
+	} else {
+		supported := binfmt_misc.ValidatePlatforms(cfg.Workers.Containerd.Platforms)
+		if !supported {
+			logrus.Warn("provided platforms cannot pass the validation, please check the configuration on the 'binfmt_misc'")
+		}
 	}
 
 	if system.RunningInUserNS() {

diff --git a/cmd/buildkitd/main_containerd_worker.go b/cmd/buildkitd/main_containerd_worker.go
@@ -10,6 +10,7 @@ import (
 
 	ctd "github.com/containerd/containerd"
 	"github.com/moby/buildkit/cmd/buildkitd/config"
+	"github.com/moby/buildkit/util/binfmt_misc"
 	"github.com/moby/buildkit/worker"
 	"github.com/moby/buildkit/worker/base"
 	"github.com/moby/buildkit/worker/containerd"
@@ -142,6 +143,10 @@ func applyContainerdFlags(c *cli.Context, cfg *config.Config) error {
 	}
 
 	if platforms := c.GlobalStringSlice("containerd-worker-platform"); len(platforms) != 0 {
+		supported := binfmt_misc.ValidatePlatforms(platforms)
+		if !supported {
+			logrus.Warn("provided platforms cannot pass the validation, please check the configuration on the 'binfmt_misc'")
+		}
 		cfg.Workers.Containerd.Platforms = platforms
 	}
 

diff --git a/cmd/buildkitd/main_oci_worker.go b/cmd/buildkitd/main_oci_worker.go
@@ -11,6 +11,7 @@ import (
 	"github.com/containerd/containerd/snapshots/overlay"
 	"github.com/moby/buildkit/cmd/buildkitd/config"
 	"github.com/moby/buildkit/executor/oci"
+	"github.com/moby/buildkit/util/binfmt_misc"
 	"github.com/moby/buildkit/worker"
 	"github.com/moby/buildkit/worker/base"
 	"github.com/moby/buildkit/worker/runc"
@@ -142,6 +143,10 @@ func applyOCIFlags(c *cli.Context, cfg *config.Config) error {
 	}
 
 	if platforms := c.GlobalStringSlice("oci-worker-platform"); len(platforms) != 0 {
+		supported := binfmt_misc.ValidatePlatforms(platforms)
+		if !supported {
+			logrus.Warn("provided platforms cannot pass the validation, please check the configuration on the 'binfmt_misc'")
+		}
 		cfg.Workers.OCI.Platforms = platforms
 	}
 

diff --git a/util/binfmt_misc/detect.go b/util/binfmt_misc/detect.go
@@ -30,3 +30,22 @@ func SupportedPlatforms() []string {
 
 	return arr
 }
+
+func ValidatePlatforms(pf []string) bool {
+	def := platforms.DefaultString()
+	var supported bool = true
+	for _, p := range pf {
+		if p != def {
+			if p == "linux/amd64" && !amd64Supported() {
+				supported = false
+			}
+			if p == "linux/arm64" && !arm64Supported() {
+				supported = false
+			}
+			if (strings.HasPrefix(p, "linux/arm/v6") || strings.HasPrefix(p, "linux/arm/v7")) && !armSupported() {
+				supported = false
+			}
+		}
+	}
+	return supported
+}