Skip to content

Do not drop OS version when converting build options to solver option frontend attributes #4008

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

Open
brandond wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −1
Open

Do not drop OS version when converting build options to solver option frontend attributes #4008

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
2ac345f
Do not drop OS version when constructing build options
brandond Aug 11, 2026
0ea6302
test: integration coverage for OS version platforms
crazy-max Aug 11, 2026
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
2 changes: 1 addition & 1 deletion build/opt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ func toSolveOpt(ctx context.Context, np *noderesolver.ResolvedNode, multiDriver
if len(opt.Platforms) != 0 {
pp := make([]string, len(opt.Platforms))
for i, p := range opt.Platforms {
pp[i] = platforms.Format(p)
pp[i] = platforms.FormatAll(p)
}
if len(pp) > 1 && !nodeDriver.Features(ctx)[driver.MultiPlatform] {
return nil, nil, notSupported(driver.MultiPlatform, nodeDriver, "https://docs.docker.com/go/build-multi-platform/")
Expand Down
18 changes: 18 additions & 0 deletions tests/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ var buildTests = []func(t *testing.T, sb integration.Sandbox){
testBuildCacheExportNotSupported,
testBuildOCIExportNotSupported,
testBuildMultiPlatform,
testBuildTargetPlatformOSVersion,
testDockerHostGateway,
testBuildNetworkModeBridge,
testBuildShmSize,
Expand Down Expand Up @@ -1006,6 +1007,23 @@ func testBuildMultiPlatform(t *testing.T, sb integration.Sandbox) {
}
}

func testBuildTargetPlatformOSVersion(t *testing.T, sb integration.Sandbox) {
skipNoCompatBuildKit(t, sb, ">= 0.19.0-0", "platform OS version")
integration.SkipOnPlatform(t, "windows")

dockerfile := []byte(`
FROM --platform=$BUILDPLATFORM busybox:latest
ARG TARGETPLATFORM
ARG TARGETOSVERSION
RUN test "$TARGETPLATFORM" = "windows(10.0.17763)/amd64"
RUN test "$TARGETOSVERSION" = "10.0.17763"
`)
dir := tmpdir(t, fstest.CreateFile("Dockerfile", dockerfile, 0o600))

out, err := buildCmd(sb, withArgs("--platform=windows(10.0.17763)/amd64", "--output=type=cacheonly", dir))
require.NoError(t, err, string(out))
}

func testDockerHostGateway(t *testing.T, sb integration.Sandbox) {
dockerfile := []byte(`
FROM busybox
Expand Down
Loading