bake: Fix always building Linux binaries#128
Merged
dmcgowan merged 1 commit intocontainerd:mainfrom Mar 20, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates the Docker Bake configuration to stop overriding BuildKit’s platform-injected TARGETOS and instead drive host-binary builds via platforms, so TARGETOS/TARGETARCH are derived from the selected platform.
Changes:
- Add
_DOCKER_ARCHto translateKERNEL_ARCHvalues into Docker platform arch names. - Replace
_host_common’s explicitTARGETOSbuild-arg override with aplatformsdeclaration. - Make
libkrunexplicitly build forlinux/${_DOCKER_ARCH}instead of inheriting_host_common.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
63bb023 to
52a7127
Compare
Commit a4eb9d7 introduced _host_common which passed TARGETOS as an explicit build arg set to HOST_OS (default "linux"). This overrode Docker's automatic platform-injected TARGETOS variable, so the shim always built for linux regardless of the target platform set via --platform or platforms. Replace the TARGETOS build arg with the platforms field on _host_common so Docker's platform mechanism correctly injects TARGETOS and TARGETARCH Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
52a7127 to
4bcbf99
Compare
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
dmcgowan
approved these changes
Mar 20, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Commit a4eb9d7 introduced _host_common which passed TARGETOS as an explicit build arg set to HOST_OS (default "linux").
This overrode Docker's automatic platform-injected TARGETOS variable, so the shim always built for linux regardless of the target platform set via --platform or platforms.
Replace the TARGETOS build arg with the platforms field on _host_common so Docker's platform mechanism correctly injects TARGETOS and TARGETARCH