dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-03 22:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48038 from thaJeztah/builder_allow_buildkit

Browse Source 
api/server/router/build: BuilderVersion: allow buildkit on Windows
This commit is contained in:
Sebastiaan van Stijn
2025-05-22 14:13:50 +02:00
committed by GitHub
parent 56d5a46c0f c6b9bb00f9
commit 32c5774524
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
api/server/router/build/build.go
View File

@@ -4,7 +4,7 @@ import (
"runtime"
"github.com/docker/docker/api/server/router"
build2 "github.com/docker/docker/api/types/build"
"github.com/docker/docker/api/types/build"
)
// buildRouter is a router to talk with the build controller
@@ -46,15 +46,22 @@ func (br *buildRouter) initRoutes() {
//
// This value is only a recommendation as advertised by the daemon, and it is
// up to the client to choose which builder to use.
func BuilderVersion(features map[string]bool) build2.BuilderVersion {
func BuilderVersion(features map[string]bool) build.BuilderVersion {
// TODO(thaJeztah) move the default to daemon/config
bv := build.BuilderBuildKit
if runtime.GOOS == "windows" {
return build2.BuilderV1
// BuildKit is not yet the default on Windows.
bv = build.BuilderV1
}
bv := build2.BuilderBuildKit
if v, ok := features["buildkit"]; ok && !v {
bv = build2.BuilderV1
// Allow the features field in the daemon config to override the
// default builder to advertise.
if enable, ok := features["buildkit"]; ok {
if enable {
bv = build.BuilderBuildKit
} else {
bv = build.BuilderV1
}
}
return bv
}

6
cmd/dockerd/daemon.go
View File

@@ -294,6 +294,12 @@ func (cli *daemonCLI) start(ctx context.Context) (err error) {
return fmt.Errorf("error initializing buildkit: %w", err)
}
if runtime.GOOS == "windows" {
if enabled, ok := d.Features()["buildkit"]; ok && enabled {
log.G(ctx).Warn("Buildkit feature is enabled in the daemon.json configuration file. Support for BuildKit on Windows is experimental, and enabling this feature may not work. Use at your own risk!")
}
}
routers := buildRouters(routerOptions{
features: d.Features,
daemon: d,