From 2ced7acdd91988d9bac45a117dd917c92e8ba853 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 22 Jan 2024 20:27:40 -0300 Subject: [PATCH] fix(docker): remove --builder=default from default args when use=buildx (#4566) refs #4392 Signed-off-by: Carlos Alexandro Becker --- internal/pipe/docker/api_docker.go | 2 +- internal/pipe/docker/docker_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/pipe/docker/api_docker.go b/internal/pipe/docker/api_docker.go index b22bb9d079d..6507aa65b4a 100644 --- a/internal/pipe/docker/api_docker.go +++ b/internal/pipe/docker/api_docker.go @@ -73,7 +73,7 @@ func (i dockerImager) Build(ctx *context.Context, root string, images, flags []s func (i dockerImager) buildCommand(images, flags []string) []string { base := []string{"build", "."} if i.buildx { - base = []string{"buildx", "--builder", "default", "build", ".", "--load"} + base = []string{"buildx", "build", ".", "--load"} } for _, image := range images { base = append(base, "-t", image) diff --git a/internal/pipe/docker/docker_test.go b/internal/pipe/docker/docker_test.go index e33b898b8e7..ad5802f991d 100644 --- a/internal/pipe/docker/docker_test.go +++ b/internal/pipe/docker/docker_test.go @@ -1113,7 +1113,7 @@ func TestBuildCommand(t *testing.T) { name: "buildx", buildx: true, flags: []string{"--label=foo", "--build-arg=bar=baz"}, - expect: []string{"buildx", "--builder", "default", "build", ".", "--load", "-t", images[0], "-t", images[1], "--label=foo", "--build-arg=bar=baz"}, + expect: []string{"buildx", "build", ".", "--load", "-t", images[0], "-t", images[1], "--label=foo", "--build-arg=bar=baz"}, }, } for _, tt := range tests {