diff --git a/environment/container/containerd/containerd.go b/environment/container/containerd/containerd.go index d6c78594..79a4e1f9 100644 --- a/environment/container/containerd/containerd.go +++ b/environment/container/containerd/containerd.go @@ -3,7 +3,6 @@ package containerd import ( "github.com/abiosoft/colima/cli" "github.com/abiosoft/colima/environment" - "strconv" ) // Name is container runtime name @@ -42,8 +41,6 @@ func (c containerdRuntime) Provision() error { return nil } -const multiArchKey = "containerd_multi_arch" - func (c containerdRuntime) Start() error { a := c.Init() a.Stage("starting") @@ -51,15 +48,9 @@ func (c containerdRuntime) Start() error { return c.guest.Run("sudo", "service", "containerd", "start") }) + // tonistiigi/binfmt a.Add(func() error { - enabled, _ := strconv.ParseBool(c.guest.Get(multiArchKey)) - if !enabled { - err := c.guest.Run("sudo", "nerdctl", "run", "--privileged", "--rm", "tonistiigi/binfmt", "--install", "all") - if err == nil { - _ = c.guest.Set(multiArchKey, "true") - _ = c.guest.Run("sudo", "nerdctl", "rmi", "tonistiigi/binfmt") - } - } + _ = c.guest.Run("sudo", "nerdctl", "run", "--privileged", "--rm", "tonistiigi/binfmt", "--install", "all") return nil }) diff --git a/environment/container/docker/docker.go b/environment/container/docker/docker.go index 93b20570..390271fa 100644 --- a/environment/container/docker/docker.go +++ b/environment/container/docker/docker.go @@ -96,8 +96,6 @@ func (d dockerRuntime) Provision() error { return a.Exec() } -const multiArchKey = "docker_multi_arch" - func (d dockerRuntime) Start() error { a := d.Init() a.Stage("starting") @@ -109,14 +107,7 @@ func (d dockerRuntime) Start() error { return d.host.RunQuiet("launchctl", "load", d.launchd.File()) }) a.Add(func() error { - enabled, _ := strconv.ParseBool(d.guest.Get(multiArchKey)) - if !enabled { - err := d.guest.RunQuiet("docker", "run", "--privileged", "--rm", "tonistiigi/binfmt", "--install", "all") - if err == nil { - _ = d.guest.Set(multiArchKey, "true") - _ = d.guest.Run("docker", "rmi", "-f", "tonistiigi/binfmt") - } - } + _ = d.guest.Run("docker", "run", "--privileged", "--rm", "tonistiigi/binfmt", "--install", "all") return nil })