Platform on create by cpuguy83 · Pull Request #2551 · docker/cli

cpuguy83 · 2020-05-27T19:37:56Z

- What I did
Set platform on container create API.

Previously we only set the platform when performing a pull, which is
only initiated if pull always is set, or if the image reference does not
exist in the daemon.

The daemon now supports specifying which platform you wanted on
container create so it can validate the image reference is the platform
you thought you were getting.

- How I did it
Propagate platform to the container create API

- How to verify it

Run engine master with DOCKER_API_VERSION=1.41

docker run --platform=linux/armhf busybox
docker run busybox

Before this change:
The 2nd run would run an armhf image somewhat unexpectedly.

After this change:
The 2nd run will do a new pull to get the host native arch (ie linux/amd64).

- Description for the changelog

Propagate platform flag to container create API

- A picture of a cute animal (not mandatory but encouraged)

This brings in client support to set the platform on container create. Signed-off-by: Brian Goff <cpuguy83@gmail.com>

thaJeztah · 2020-05-27T20:43:36Z

@cpuguy83 Looks like there's a build failure

cli/command/container/create_test.go:115:4: cannot use func literal (type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, string) (container.ContainerCreateCreatedBody, error)) as type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, *v1.Platform, string) (container.ContainerCreateCreatedBody, error) in field value
cli/command/container/create_test.go:184:4: cannot use func literal (type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, string) (container.ContainerCreateCreatedBody, error)) as type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, *v1.Platform, string) (container.ContainerCreateCreatedBody, error) in field value
cli/command/container/create_test.go:244:5: cannot use func literal (type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, string) (container.ContainerCreateCreatedBody, error)) as type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, *v1.Platform, string) (container.ContainerCreateCreatedBody, error) in field value
cli/command/container/create_test.go:280:3: cannot use func literal (type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, string) (container.ContainerCreateCreatedBody, error)) as type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, *v1.Platform, string) (container.ContainerCreateCreatedBody, error) in field value
cli/command/container/run_test.go:18:3: cannot use func literal (type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, string) (container.ContainerCreateCreatedBody, error)) as type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, *v1.Platform, string) (container.ContainerCreateCreatedBody, error) in field value
cli/command/container/run_test.go:58:4: cannot use func literal (type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, string) (container.ContainerCreateCreatedBody, error)) as type func(*container.Config, *container.HostConfig, *network.NetworkingConfig, *v1.Platform, string) (container.ContainerCreateCreatedBody, error) in field value

Previously we only set the platform when performing a pull, which is only initiated if pull always is set, or if the image reference does not exist in the daemon. The daemon now supports specifying which platform you wanted on container create so it can validate the image reference is the platform you thought you were getting. Signed-off-by: Brian Goff <cpuguy83@gmail.com>

thaJeztah · 2020-05-28T15:58:58Z

cli/command/container/create.go

+	// Engine API version 1.41 first introduced the option to specify platform on
+	// create. It will produce an error if you try to set a platform on older API
+	// versions, so check the API version here to maintain backwards
+	// compatibility for CLI users.


Should we change

cli/cli/command/utils.go

Lines 125 to 129 in 590f327

func AddPlatformFlag(flags *pflag.FlagSet, target *string) {

flags.StringVar(target, "platform", os.Getenv("DOCKER_DEFAULT_PLATFORM"), "Set platform if server is multi-platform capable")

flags.SetAnnotation("platform", "version", []string{"1.32"})

flags.SetAnnotation("platform", "experimental", nil)

}

to restrict the option to API v1.41 and up?

Platform is supported on pull since I don't know when.

thaJeztah · 2020-06-04T19:03:40Z

@tonistiigi ptal 🤗

thaJeztah

LGTM

@tonistiigi @tiborvass PTAL

tiborvass · 2020-06-09T17:52:24Z

On moby I'm using master at a2282777c6 with this CLI, and I get:

$ ./build/docker run -it --rm --platform arm64 busybox
standard_init_linux.go:190: exec user process caused "no such file or directory"
$ cat > /tmp/foo.go
package main

import (
	"fmt"
	"runtime"
)

func main() {
	fmt.Println(runtime.GOARCH)
}
$ GOARCH=arm64 go run /tmp/foo.go # proof that aarch64 qemu is registered in binfmt
arm64

cpuguy83 · 2020-06-09T22:12:24Z

@tiborvass I'm not sure I'm following along, here is what I'm seeing:

root@b592547c5784:/go/src/github.com/docker/docker# docker rmi busybox:latest
Untagged: busybox:latest
Deleted: sha256:19d689bc58fd64da6a46d46512ea965a12b6bfb5b030400e21bc0a04c4ff155e
Deleted: sha256:7ce37844ca75600dbcbe085858845c5b92b6109db3c8c1ae6eb887aab91ad04f
root@b592547c5784:/go/src/github.com/docker/docker# docker pull --platform=amd64 busybox:latest
latest: Pulling from library/busybox
Digest: sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209
Status: Downloaded newer image for busybox:latest
docker.io/library/busybox:latest
root@b592547c5784:/go/src/github.com/docker/docker#  docker run -it --rm --platform=arm64 busybox sh
Unable to find image 'busybox:latest' locally
latest: Pulling from library/busybox
fd44016e3d3e: Pull complete
Digest: sha256:95cf004f559831017cdf4628aaf1bb30133677be8702a8c5f2994629f637a209
Status: Downloaded newer image for busybox:latest
standard_init_linux.go:211: exec user process caused "exec format error"

After setting up binfmt:

root@b592547c5784:/go/src/github.com/docker/docker#  docker run -it --rm --platform=arm64 busybox sh
/ #

Bump docker/docker vendor

8c986d3

This brings in client support to set the platform on container create. Signed-off-by: Brian Goff <cpuguy83@gmail.com>

cpuguy83 requested review from thaJeztah, tiborvass and tonistiigi May 27, 2020 19:37

cpuguy83 force-pushed the platform_on_create branch from 5572cd1 to e108122 Compare May 27, 2020 19:59

thaJeztah added the status/2-code-review label May 27, 2020

cpuguy83 force-pushed the platform_on_create branch from e108122 to 14139d7 Compare May 27, 2020 23:56

cpuguy83 force-pushed the platform_on_create branch from 14139d7 to ccd9d63 Compare May 28, 2020 00:17

thaJeztah reviewed May 28, 2020

View reviewed changes

thaJeztah approved these changes Jun 9, 2020

View reviewed changes

thaJeztah added the impact/changelog label Jun 9, 2020

thaJeztah added this to the 20.03.0 milestone Jun 9, 2020

tiborvass approved these changes Jun 11, 2020

View reviewed changes

tiborvass merged commit 31822ff into docker:master Jun 11, 2020

cpuguy83 deleted the platform_on_create branch June 11, 2020 18:53

This was referenced Jun 17, 2020

docker run ignores --platform for cached images #2590

Closed

No way to specify arch in docker {run,pull,build} moby/moby#36552

Closed

mark-vieira mentioned this pull request Mar 1, 2021

Update Docker image used by minio test fixture to support Arm elastic/elasticsearch#69743

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Platform on create#2551

Platform on create#2551
tiborvass merged 2 commits intodocker:masterfrom
cpuguy83:platform_on_create

cpuguy83 commented May 27, 2020

Uh oh!

thaJeztah commented May 27, 2020

Uh oh!

thaJeztah May 28, 2020

Uh oh!

cpuguy83 May 28, 2020

Uh oh!

thaJeztah commented Jun 4, 2020

Uh oh!

thaJeztah left a comment

Uh oh!

tiborvass commented Jun 9, 2020

Uh oh!

cpuguy83 commented Jun 9, 2020 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	func AddPlatformFlag(flags pflag.FlagSet, target string) {
	flags.StringVar(target, "platform", os.Getenv("DOCKER_DEFAULT_PLATFORM"), "Set platform if server is multi-platform capable")
	flags.SetAnnotation("platform", "version", []string{"1.32"})
	flags.SetAnnotation("platform", "experimental", nil)
	}

Conversation

cpuguy83 commented May 27, 2020

Uh oh!

thaJeztah commented May 27, 2020

Uh oh!

thaJeztah May 28, 2020

Choose a reason for hiding this comment

Uh oh!

cpuguy83 May 28, 2020

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Jun 4, 2020

Uh oh!

thaJeztah left a comment

Choose a reason for hiding this comment

Uh oh!

tiborvass commented Jun 9, 2020

Uh oh!

cpuguy83 commented Jun 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

cpuguy83 commented Jun 9, 2020 •

edited

Loading