-
Notifications
You must be signed in to change notification settings - Fork 5.1k
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.
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
Add platforms build #9729
Merged
Merged
Add platforms build #9729
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8b1b708
add support of platforms in build section
glours 537f023
fix panic when using 'compose up --build'
glours 8ed2d8a
add a test with multiple service builds using platforms in the same c…
glours e016faa
don't push images at the end of multi-arch build (and simplify e2e te…
glours 44c55e8
always use 'docker' export entry when building with 'up' or 'run' com…
glours File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| Copyright 2020 Docker Compose CLI authors | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package compose | ||
|
|
||
| import ( | ||
| "github.com/moby/buildkit/util/tracing/detect" | ||
| "go.opentelemetry.io/otel" | ||
|
|
||
| _ "github.com/moby/buildkit/util/tracing/detect/delegated" //nolint:blank-imports | ||
| _ "github.com/moby/buildkit/util/tracing/env" //nolint:blank-imports | ||
| ) | ||
|
|
||
| func init() { | ||
| detect.ServiceName = "compose" | ||
| // do not log tracing errors to stdio | ||
| otel.SetErrorHandler(skipErrors{}) | ||
| } | ||
|
|
||
| type skipErrors struct{} | ||
|
|
||
| func (skipErrors) Handle(err error) {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need to make sure we don't add a duplicate if a platform is already present via
DOCKER_DEFAULT_PLATFORMabove:(Given how cryptic the BuildKit error is, it might also be beneficial [perhaps in
compose-goloader/validate?] to error if duplicates exist inservice.build.platforms, but I'm less concerned about that.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, is it weird that you can "extend" the supported platforms via
DOCKER_DEFAULT_PLATFORM?e.g. in the same example above,
DOCKER_DEFAULT_PLATFORM=linux/arm64 docker compose build hellowould build both AMD64 + ARM64 images even though onlylinux/amd64is actually incompose.yaml.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does it make sense for you if we manage the
DOCKER_DEFAULT_PLATFORMlike theservice.platform, which means refuse to build if theDOCKER_DEFAULT_PLATFORMisn't defined in theservice.build.platformssection?