Merge pull request #3033 from tonistiigi/runtime-platforms

crosbymichael · web-flow · commit 31438b61f964 · 2019-02-21T10:39:42.000-05:00
runtime: allow specifying supported platforms with config
diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go
@@ -29,20 +29,36 @@ import (
 	"github.com/containerd/containerd/metadata"
 	"github.com/containerd/containerd/mount"
 	"github.com/containerd/containerd/namespaces"
+	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/plugin"
 	"github.com/containerd/containerd/runtime"
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	bolt "go.etcd.io/bbolt"
 )
 
+// Config for the v2 runtime
+type Config struct {
+	// Supported platforms
+	Platforms []string `toml:"platforms"`
+}
+
 func init() {
 	plugin.Register(&plugin.Registration{
 		Type: plugin.RuntimePluginV2,
 		ID:   "task",
 		Requires: []plugin.Type{
 			plugin.MetadataPlugin,
 		},
+		Config: &Config{
+			Platforms: defaultPlatforms(),
+		},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
-			ic.Meta.Platforms = supportedPlatforms()
+			supportedPlatforms, err := parsePlatforms(ic.Config.(*Config).Platforms)
+			if err != nil {
+				return nil, err
+			}
+
+			ic.Meta.Platforms = supportedPlatforms
 			if err := os.MkdirAll(ic.Root, 0711); err != nil {
 				return nil, err
 			}
@@ -262,3 +278,15 @@ func (m *TaskManager) cleanupWorkDirs(ctx context.Context) error {
 	}
 	return nil
 }
+
+func parsePlatforms(platformStr []string) ([]ocispec.Platform, error) {
+	p := make([]ocispec.Platform, len(platformStr))
+	for i, v := range platformStr {
+		parsed, err := platforms.Parse(v)
+		if err != nil {
+			return nil, err
+		}
+		p[i] = parsed
+	}
+	return p, nil
+}
diff --git a/runtime/v2/manager_unix.go b/runtime/v2/manager_unix.go
@@ -20,9 +20,8 @@ package v2
 
 import (
 	"github.com/containerd/containerd/platforms"
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
-func supportedPlatforms() []ocispec.Platform {
-	return []ocispec.Platform{platforms.DefaultSpec()}
+func defaultPlatforms() []string {
+	return []string{platforms.DefaultString()}
 }
diff --git a/runtime/v2/manager_windows.go b/runtime/v2/manager_windows.go
@@ -20,15 +20,11 @@ package v2
 
 import (
 	"github.com/containerd/containerd/platforms"
-	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
-func supportedPlatforms() []ocispec.Platform {
-	return []ocispec.Platform{
-		platforms.DefaultSpec(),
-		{
-			OS:           "linux",
-			Architecture: "amd64",
-		},
+func defaultPlatforms() []string {
+	return []string{
+		platforms.DefaultString(),
+		"linux/amd64",
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,8 @@ package v2`
`20`	`20`
`21`	`21`	`import (`
`22`	`22`	`"github.com/containerd/containerd/platforms"`
`23`		`- ocispec "github.com/opencontainers/image-spec/specs-go/v1"`
`24`	`23`	`)`
`25`	`24`
`26`		`-func supportedPlatforms() []ocispec.Platform {`
`27`		`- return []ocispec.Platform{platforms.DefaultSpec()}`
	`25`	`+func defaultPlatforms() []string {`
	`26`	`+ return []string{platforms.DefaultString()}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,11 @@ package v2`
`20`	`20`
`21`	`21`	`import (`
`22`	`22`	`"github.com/containerd/containerd/platforms"`
`23`		`- ocispec "github.com/opencontainers/image-spec/specs-go/v1"`
`24`	`23`	`)`
`25`	`24`
`26`		`-func supportedPlatforms() []ocispec.Platform {`
`27`		`- return []ocispec.Platform{`
`28`		`- platforms.DefaultSpec(),`
`29`		`- {`
`30`		`- OS: "linux",`
`31`		`- Architecture: "amd64",`
`32`		`- },`
	`25`	`+func defaultPlatforms() []string {`
	`26`	`+ return []string{`
	`27`	`+ platforms.DefaultString(),`
	`28`	`+ "linux/amd64",`
`33`	`29`	`}`
`34`	`30`	`}`