Skip to content

[WIP pending moby/moby] - LCOW: Add --platform to docker build #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lowenna wants to merge 2 commits into from
Closed

[WIP pending moby/moby] - LCOW: Add --platform to docker build #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d462d9
HACK: Needs PR 34401 to moby/moby merging - Vendoring
Aug 3, 2017
100eff5
LCOW: Add platform to build
Aug 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cli/command/image/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ type buildOptions struct {
target string
imageIDFile string
stream bool
platform string
}

// dockerfileFromStdin returns true when the user specified that the Dockerfile
Expand Down Expand Up @@ -143,6 +144,8 @@ func NewBuildCommand(dockerCli command.Cli) *cobra.Command {
flags.SetAnnotation("stream", "experimental", nil)
flags.SetAnnotation("stream", "version", []string{"1.31"})

flags.StringVar(&options.platform, "platform", "", "Set platform if server is multi-platform capable")
flags.SetAnnotation("platform", "version", []string{"1.30"})
return cmd
}

Expand Down Expand Up @@ -372,6 +375,7 @@ func runBuild(dockerCli command.Cli, options buildOptions) error {
ExtraHosts: options.extraHosts.GetAll(),
Target: options.target,
RemoteContext: remote,
Platform: options.platform,
}

if s != nil {
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/docker/docker/api/common.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions vendor/github.com/docker/docker/api/types/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions vendor/github.com/docker/docker/client/image_build.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.