builder: cover windows buildkit defaults

VrtxOmega · VrtxOmega · commit 2c350cd361b4 · 2026-06-03T13:20:42.000-05:00
diff --git a/cli/command/cli_test.go b/cli/command/cli_test.go
@@ -252,6 +252,18 @@ func TestDefaultBuildKitEnabled(t *testing.T) {
 	}
 }
 
+func TestBuildKitEnabledWithBuilderAlias(t *testing.T) {
+	cli := &DockerCli{
+		configFile: &configfile.ConfigFile{
+			Aliases: map[string]string{"builder": "buildx"},
+		},
+	}
+
+	enabled, err := cli.BuildKitEnabled()
+	assert.NilError(t, err)
+	assert.Check(t, enabled)
+}
+
 // Makes sure we don't hang forever on the initial connection.
 // https://github.com/docker/cli/issues/3652
 func TestInitializeFromClientHangs(t *testing.T) {
diff --git a/cmd/docker/builder_test.go b/cmd/docker/builder_test.go
@@ -129,6 +129,14 @@ func (*fakeClient) Ping(context.Context, client.PingOptions) (client.PingResult,
 	return client.PingResult{OSType: "linux"}, nil
 }
 
+type fakeWindowsClient struct {
+	client.Client
+}
+
+func (*fakeWindowsClient) Ping(context.Context, client.PingOptions) (client.PingResult, error) {
+	return client.PingResult{OSType: "windows"}, nil
+}
+
 func TestIsWindowsBuilderDefault(t *testing.T) {
 	tests := []struct {
 		name       string
@@ -209,6 +217,42 @@ func TestBuildkitDisabled(t *testing.T) {
 	})
 }
 
+func TestBuildkitDisabledWithWindowsDaemonSkipsWarning(t *testing.T) {
+	ctx := t.Context()
+
+	t.Setenv("DOCKER_BUILDKIT", "0")
+
+	dir := fs.NewDir(t, t.Name(),
+		fs.WithFile(pluginFilename, `#!/bin/sh exit 1`, fs.WithMode(0o777)),
+	)
+	defer dir.Remove()
+
+	b := bytes.NewBuffer(nil)
+
+	dockerCli, err := command.NewDockerCli(
+		command.WithBaseContext(ctx),
+		command.WithAPIClient(&fakeWindowsClient{}),
+		command.WithInputStream(discard),
+		command.WithCombinedStreams(b),
+	)
+	assert.NilError(t, err)
+	assert.NilError(t, dockerCli.Initialize(flags.NewClientOptions()))
+	dockerCli.ConfigFile().CLIPluginsExtraDirs = []string{dir.Path()}
+
+	tcmd := newDockerCommand(dockerCli)
+	tcmd.SetArgs([]string{"build", "."})
+
+	cmd, args, err := tcmd.HandleGlobalFlags()
+	assert.NilError(t, err)
+
+	var envs []string
+	args, os.Args, envs, err = processBuilder(dockerCli, cmd, args, os.Args)
+	assert.NilError(t, err)
+	assert.DeepEqual(t, []string{"build", "."}, args)
+	assert.Check(t, len(envs) == 0)
+	assert.Equal(t, b.String(), "")
+}
+
 func TestBuilderBroken(t *testing.T) {
 	ctx := t.Context()
 
