Pass --platform information into Container Create (#285)

Author: stuartpa

cmd/modern/root/install/mssql-base.go

@@ -45,8 +45,10 @@ type MssqlBase struct {
 	defaultContextName     string
 	collation              string
 
-	name     string
-	hostname string
+	name         string
+	hostname     string
+	architecture string
+	os           string
 
 	port int
 
@@ -173,6 +175,20 @@ func (c *MssqlBase) AddFlags(
 		Usage:         "Explicitly set the container hostname, it defaults to the container ID",
 	})
 
+	addFlag(cmdparser.FlagOptions{
+		String:        &c.architecture,
+		DefaultString: "amd64",
+		Name:          "architecture",
+		Usage:         "Specifies the image CPU architecture",
+	})
+
+	addFlag(cmdparser.FlagOptions{
+		String:        &c.os,
+		DefaultString: "linux",
+		Name:          "os",
+		Usage:         "Specifies the image operating system",
+	})
+
 	addFlag(cmdparser.FlagOptions{
 		String:        &c.collation,
 		DefaultString: "SQL_Latin1_General_CP1_CI_AS",
@@ -272,6 +288,8 @@ func (c *MssqlBase) createContainer(imageName string, contextName string) {
 		c.port,
 		c.name,
 		c.hostname,
+		c.architecture,
+		c.os,
 		[]string{},
 		false,
 	)

internal/container/controller.go

@@ -13,6 +13,7 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/docker/go-connections/nat"
+	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"io"
 	"path/filepath"
 	"strconv"
@@ -71,6 +72,8 @@ func (c Controller) ContainerRun(
 	port int,
 	name string,
 	hostname string,
+	architecture string,
+	os string,
 	command []string,
 	unitTestFailure bool,
 ) string {
@@ -85,14 +88,18 @@ func (c Controller) ContainerRun(
 		},
 	}
 
+	platform := specs.Platform{
+		Architecture: architecture,
+		OS:           os,
+	}
+
 	resp, err := c.cli.ContainerCreate(context.Background(), &container.Config{
-		Tty:        true,
-		Image:      image,
-		Cmd:        command,
-		Env:        env,
-		Hostname:   hostname,
-		Domainname: name,
-	}, hostConfig, nil, nil, "")
+		Tty:      true,
+		Image:    image,
+		Cmd:      command,
+		Env:      env,
+		Hostname: hostname,
+	}, hostConfig, nil, &platform, name)
 	checkErr(err)
 
 	err = c.cli.ContainerStart(

internal/container/controller_test.go

@@ -33,7 +33,17 @@ func TestController_EnsureImage(t *testing.T) {
 	c := NewController()
 	err := c.EnsureImage(imageName)
 	checkErr(err)
-	id := c.ContainerRun(imageName, []string{}, port, "", "", []string{"ash", "-c", "echo 'Hello World'; sleep 3"}, false)
+	id := c.ContainerRun(
+		imageName,
+		[]string{},
+		port,
+		"",
+		"",
+		"amd64",
+		"linux",
+		[]string{"ash", "-c", "echo 'Hello World'; sleep 3"},
+		false,
+	)
 	c.ContainerRunning(id)
 	c.ContainerWaitForLogEntry(id, "Hello World")
 	c.ContainerExists(id)
@@ -76,6 +86,8 @@ func TestController_ContainerRunFailure(t *testing.T) {
 			0,
 			"",
 			"",
+			"amd64",
+			"linux",
 			[]string{"ash", "-c", "echo 'Hello World'; sleep 1"},
 			false,
 		)
@@ -102,6 +114,8 @@ func TestController_ContainerRunFailureCleanup(t *testing.T) {
 			0,
 			"",
 			"",
+			"amd64",
+			"linux",
 			[]string{"ash", "-c", "echo 'Hello World'; sleep 1"},
 			true,
 		)