@@ -1,12 +1,5 @@

 package build

-import (

-	"io"

-

-	"github.com/moby/moby/api/types/container"

-	"github.com/moby/moby/api/types/registry"

-)

-

 // BuilderVersion sets the version of underlying builder to use

 type BuilderVersion string

@@ -21,71 +14,3 @@ const (

 type Result struct {

 	ID string

 }

-

-// ImageBuildOptions holds the information

-// necessary to build images.

-type ImageBuildOptions struct {

-	Tags           []string

-	SuppressOutput bool

-	RemoteContext  string

-	NoCache        bool

-	Remove         bool

-	ForceRemove    bool

-	PullParent     bool

-	Isolation      container.Isolation

-	CPUSetCPUs     string

-	CPUSetMems     string

-	CPUShares      int64

-	CPUQuota       int64

-	CPUPeriod      int64

-	Memory         int64

-	MemorySwap     int64

-	CgroupParent   string

-	NetworkMode    string

-	ShmSize        int64

-	Dockerfile     string

-	Ulimits        []*container.Ulimit

-	// BuildArgs needs to be a *string instead of just a string so that

-	// we can tell the difference between "" (empty string) and no value

-	// at all (nil). See the parsing of buildArgs in

-	// api/server/router/build/build_routes.go for even more info.

-	BuildArgs   map[string]*string

-	AuthConfigs map[string]registry.AuthConfig

-	Context     io.Reader

-	Labels      map[string]string

-	// squash the resulting image's layers to the parent

-	// preserves the original image and creates a new one from the parent with all

-	// the changes applied to a single layer

-	Squash bool

-	// CacheFrom specifies images that are used for matching cache. Images

-	// specified here do not need to have a valid parent chain to match cache.

-	CacheFrom   []string

-	SecurityOpt []string

-	ExtraHosts  []string // List of extra hosts

-	Target      string

-	SessionID   string

-	Platform    string

-	// Version specifies the version of the underlying builder to use

-	Version BuilderVersion

-	// BuildID is an optional identifier that can be passed together with the

-	// build request. The same identifier can be used to gracefully cancel the

-	// build with the cancel request.

-	BuildID string

-	// Outputs defines configurations for exporting build results. Only supported

-	// in BuildKit mode

-	Outputs []ImageBuildOutput

-}

-

-// ImageBuildOutput defines configuration for exporting a build result

-type ImageBuildOutput struct {

-	Type  string

-	Attrs map[string]string

-}

-

-// ImageBuildResponse holds information

-// returned by a server after building

-// an image.

-type ImageBuildResponse struct {

-	Body   io.ReadCloser

-	OSType string

-}

@@ -106,7 +106,7 @@ type DistributionAPIClient interface {

 // ImageAPIClient defines API client methods for the images

 type ImageAPIClient interface {

-	ImageBuild(ctx context.Context, context io.Reader, options build.ImageBuildOptions) (build.ImageBuildResponse, error)

+	ImageBuild(ctx context.Context, context io.Reader, options ImageBuildOptions) (ImageBuildResponse, error)

 	BuildCachePrune(ctx context.Context, opts BuildCachePruneOptions) (*build.CachePruneReport, error)

 	BuildCancel(ctx context.Context, id string) error

 	ImageCreate(ctx context.Context, parentReference string, options ImageCreateOptions) (io.ReadCloser, error)

@@ -10,7 +10,6 @@ import (

 	"strconv"

 	"strings"

-	"github.com/moby/moby/api/types/build"

 	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/api/types/network"

 )

@@ -18,15 +17,15 @@ import (

 // ImageBuild sends a request to the daemon to build images.

 // The Body in the response implements an [io.ReadCloser] and it's up to the caller to

 // close it.

-func (cli *Client) ImageBuild(ctx context.Context, buildContext io.Reader, options build.ImageBuildOptions) (build.ImageBuildResponse, error) {

+func (cli *Client) ImageBuild(ctx context.Context, buildContext io.Reader, options ImageBuildOptions) (ImageBuildResponse, error) {

 	query, err := cli.imageBuildOptionsToQuery(ctx, options)

 	if err != nil {

-		return build.ImageBuildResponse{}, err

+		return ImageBuildResponse{}, err

 	}

 	buf, err := json.Marshal(options.AuthConfigs)

 	if err != nil {

-		return build.ImageBuildResponse{}, err

+		return ImageBuildResponse{}, err

 	}

 	headers := http.Header{}

@@ -35,16 +34,16 @@ func (cli *Client) ImageBuild(ctx context.Context, buildContext io.Reader, optio

 	resp, err := cli.postRaw(ctx, "/build", query, buildContext, headers)

 	if err != nil {

-		return build.ImageBuildResponse{}, err

+		return ImageBuildResponse{}, err

 	}

-	return build.ImageBuildResponse{

+	return ImageBuildResponse{

 		Body:   resp.Body,

 		OSType: resp.Header.Get("Ostype"),

 	}, nil

 }

-func (cli *Client) imageBuildOptionsToQuery(ctx context.Context, options build.ImageBuildOptions) (url.Values, error) {

+func (cli *Client) imageBuildOptionsToQuery(ctx context.Context, options ImageBuildOptions) (url.Values, error) {

 	query := url.Values{}

 	if len(options.Tags) > 0 {

 		query["t"] = options.Tags

new file mode 100644

@@ -0,0 +1,77 @@

+package client

+

+import (

+	"io"

+

+	"github.com/moby/moby/api/types/build"

+	"github.com/moby/moby/api/types/container"

+	"github.com/moby/moby/api/types/registry"

+)

+

+// ImageBuildOptions holds the information

+// necessary to build images.

+type ImageBuildOptions struct {

+	Tags           []string

+	SuppressOutput bool

+	RemoteContext  string

+	NoCache        bool

+	Remove         bool

+	ForceRemove    bool

+	PullParent     bool

+	Isolation      container.Isolation

+	CPUSetCPUs     string

+	CPUSetMems     string

+	CPUShares      int64

+	CPUQuota       int64

+	CPUPeriod      int64

+	Memory         int64

+	MemorySwap     int64

+	CgroupParent   string

+	NetworkMode    string

+	ShmSize        int64

+	Dockerfile     string

+	Ulimits        []*container.Ulimit

+	// BuildArgs needs to be a *string instead of just a string so that

+	// we can tell the difference between "" (empty string) and no value

+	// at all (nil). See the parsing of buildArgs in

+	// api/server/router/build/build_routes.go for even more info.

+	BuildArgs   map[string]*string

+	AuthConfigs map[string]registry.AuthConfig

+	Context     io.Reader

+	Labels      map[string]string

+	// squash the resulting image's layers to the parent

+	// preserves the original image and creates a new one from the parent with all

+	// the changes applied to a single layer

+	Squash bool

+	// CacheFrom specifies images that are used for matching cache. Images

+	// specified here do not need to have a valid parent chain to match cache.

+	CacheFrom   []string

+	SecurityOpt []string

+	ExtraHosts  []string // List of extra hosts

+	Target      string

+	SessionID   string

+	Platform    string

+	// Version specifies the version of the underlying builder to use

+	Version build.BuilderVersion

+	// BuildID is an optional identifier that can be passed together with the

+	// build request. The same identifier can be used to gracefully cancel the

+	// build with the cancel request.

+	BuildID string

+	// Outputs defines configurations for exporting build results. Only supported

+	// in BuildKit mode

+	Outputs []ImageBuildOutput

+}

+

+// ImageBuildOutput defines configuration for exporting a build result

+type ImageBuildOutput struct {

+	Type  string

+	Attrs map[string]string

+}

+

+// ImageBuildResponse holds information

+// returned by a server after building

+// an image.

+type ImageBuildResponse struct {

+	Body   io.ReadCloser

+	OSType string

+}

@@ -11,7 +11,6 @@ import (

 	"testing"

 	cerrdefs "github.com/containerd/errdefs"

-	"github.com/moby/moby/api/types/build"

 	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/api/types/registry"

 	"gotest.tools/v3/assert"

@@ -21,7 +20,7 @@ import (

 func TestImageBuildError(t *testing.T) {

 	client, err := NewClientWithOpts(WithMockClient(errorMock(http.StatusInternalServerError, "Server error")))

 	assert.NilError(t, err)

-	_, err = client.ImageBuild(context.Background(), nil, build.ImageBuildOptions{})

+	_, err = client.ImageBuild(context.Background(), nil, ImageBuildOptions{})

 	assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))

 }

@@ -30,13 +29,13 @@ func TestImageBuild(t *testing.T) {

 	v2 := "value2"

 	emptyRegistryConfig := "bnVsbA=="

 	buildCases := []struct {

-		buildOptions           build.ImageBuildOptions

+		buildOptions           ImageBuildOptions

 		expectedQueryParams    map[string]string

 		expectedTags           []string

 		expectedRegistryConfig string

 	}{

 		{

-			buildOptions: build.ImageBuildOptions{

+			buildOptions: ImageBuildOptions{

 				SuppressOutput: true,

 				NoCache:        true,

 				Remove:         true,

@@ -53,7 +52,7 @@ func TestImageBuild(t *testing.T) {

 			expectedRegistryConfig: emptyRegistryConfig,

 		},

 		{

-			buildOptions: build.ImageBuildOptions{

+			buildOptions: ImageBuildOptions{

 				SuppressOutput: false,

 				NoCache:        false,

 				Remove:         false,

@@ -71,7 +70,7 @@ func TestImageBuild(t *testing.T) {

 			expectedRegistryConfig: emptyRegistryConfig,

 		},

 		{

-			buildOptions: build.ImageBuildOptions{

+			buildOptions: ImageBuildOptions{

 				RemoteContext: "remoteContext",

 				Isolation:     container.Isolation("isolation"),

 				CPUSetCPUs:    "2",

@@ -104,7 +103,7 @@ func TestImageBuild(t *testing.T) {

 			expectedRegistryConfig: emptyRegistryConfig,

 		},

 		{

-			buildOptions: build.ImageBuildOptions{

+			buildOptions: ImageBuildOptions{

 				BuildArgs: map[string]*string{

 					"ARG1": &v1,

 					"ARG2": &v2,

@@ -119,7 +118,7 @@ func TestImageBuild(t *testing.T) {

 			expectedRegistryConfig: emptyRegistryConfig,

 		},

 		{

-			buildOptions: build.ImageBuildOptions{

+			buildOptions: ImageBuildOptions{

 				Ulimits: []*container.Ulimit{

 					{

 						Name: "nproc",

@@ -141,7 +140,7 @@ func TestImageBuild(t *testing.T) {

 			expectedRegistryConfig: emptyRegistryConfig,

 		},

 		{

-			buildOptions: build.ImageBuildOptions{

+			buildOptions: ImageBuildOptions{

 				AuthConfigs: map[string]registry.AuthConfig{

 					"https://index.docker.io/v1/": {

 						Auth: "dG90bwo=",

@@ -98,7 +98,7 @@ func (bm *BuildManager) Build(ctx context.Context, config buildbackend.BuildConf

 // builderOptions are the dependencies required by the builder

 type builderOptions struct {

-	Options        *build.ImageBuildOptions

+	Options        *buildbackend.BuildOptions

 	Backend        builder.Backend

 	ProgressWriter buildbackend.ProgressWriter

 	PathCache      pathCache

@@ -108,7 +108,7 @@ type builderOptions struct {

 // Builder is a Dockerfile builder

 // It implements the builder.Backend interface.

 type Builder struct {

-	options *build.ImageBuildOptions

+	options *buildbackend.BuildOptions

 	Stdout io.Writer

 	Stderr io.Writer

@@ -130,7 +130,7 @@ type Builder struct {

 func newBuilder(ctx context.Context, options builderOptions) (*Builder, error) {

 	config := options.Options

 	if config == nil {

-		config = new(build.ImageBuildOptions)

+		config = &buildbackend.BuildOptions{}

 	}

 	imgProber, err := newImageProber(ctx, options.Backend, config.CacheFrom, config.NoCache)

@@ -343,7 +343,7 @@ func BuildFromConfig(ctx context.Context, config *container.Config, changes []st

 	}

 	b, err := newBuilder(ctx, builderOptions{

-		Options: &build.ImageBuildOptions{NoCache: true},

+		Options: &buildbackend.BuildOptions{NoCache: true},

 	})

 	if err != nil {

 		return nil, err

@@ -11,12 +11,12 @@ import (

 	"github.com/moby/buildkit/frontend/dockerfile/instructions"

 	"github.com/moby/buildkit/frontend/dockerfile/parser"

 	"github.com/moby/buildkit/frontend/dockerfile/shell"

-	"github.com/moby/moby/api/types/build"

 	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/v2/daemon/builder"

 	"github.com/moby/moby/v2/daemon/internal/image"

 	"github.com/moby/moby/v2/daemon/pkg/oci"

 	"github.com/moby/moby/v2/daemon/server/backend"

+	"github.com/moby/moby/v2/daemon/server/buildbackend"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

 )

@@ -24,19 +24,18 @@ import (

 func newBuilderWithMockBackend(t *testing.T) *Builder {

 	t.Helper()

 	mockBackend := &MockBackend{}

-	opts := &build.ImageBuildOptions{}

 	ctx := context.Background()

 	imageProber, err := newImageProber(ctx, mockBackend, nil, false)

 	assert.NilError(t, err, "Could not create image prober")

 	b := &Builder{

-		options:       opts,

+		options:       &buildbackend.BuildOptions{},

 		docker:        mockBackend,

 		Stdout:        new(bytes.Buffer),

 		disableCommit: true,

 		imageSources: newImageSources(builderOptions{

-			Options: opts,

+			Options: &buildbackend.BuildOptions{},

 			Backend: mockBackend,

 		}),

 		imageProber:      imageProber,

@@ -16,7 +16,6 @@ import (

 	"github.com/containerd/platforms"

 	"github.com/moby/go-archive"

 	"github.com/moby/go-archive/chrootarchive"

-	"github.com/moby/moby/api/types/build"

 	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/api/types/network"

 	"github.com/moby/moby/v2/daemon/builder"

@@ -24,6 +23,7 @@ import (

 	"github.com/moby/moby/v2/daemon/internal/stringid"

 	networkSettings "github.com/moby/moby/v2/daemon/network"

 	"github.com/moby/moby/v2/daemon/server/backend"

+	"github.com/moby/moby/v2/daemon/server/buildbackend"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/pkg/errors"

 )

@@ -340,7 +340,7 @@ func (b *Builder) create(ctx context.Context, runConfig *container.Config) (stri

 	return ctr.ID, nil

 }

-func hostConfigFromOptions(options *build.ImageBuildOptions) *container.HostConfig {

+func hostConfigFromOptions(options *buildbackend.BuildOptions) *container.HostConfig {

 	resources := container.Resources{

 		CgroupParent: options.CgroupParent,

 		CPUShares:    options.CPUShares,

@@ -6,7 +6,7 @@ import (

 	"path/filepath"

 	"testing"

-	"github.com/moby/moby/api/types/build"

+	"github.com/moby/moby/v2/daemon/server/buildbackend"

 	"github.com/moby/sys/user"

 	"gotest.tools/v3/assert"

 	is "gotest.tools/v3/assert/cmp"

@@ -58,7 +58,7 @@ othergrp:x:6666:

 		expected  identity

 	}{

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "UIDNoMap",

 			chownStr:  "1",

 			idMapping: unmapped,

@@ -66,7 +66,7 @@ othergrp:x:6666:

 			expected:  identity{UID: 1, GID: 1},

 		},

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "UIDGIDNoMap",

 			chownStr:  "0:1",

 			idMapping: unmapped,

@@ -74,7 +74,7 @@ othergrp:x:6666:

 			expected:  identity{UID: 0, GID: 1},

 		},

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "UIDWithMap",

 			chownStr:  "0",

 			idMapping: remapped,

@@ -82,7 +82,7 @@ othergrp:x:6666:

 			expected:  identity{UID: 100000, GID: 100000},

 		},

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "UIDGIDWithMap",

 			chownStr:  "1:33",

 			idMapping: remapped,

@@ -90,7 +90,7 @@ othergrp:x:6666:

 			expected:  identity{UID: 100001, GID: 100033},

 		},

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "UserNoMap",

 			chownStr:  "bin:5555",

 			idMapping: unmapped,

@@ -98,7 +98,7 @@ othergrp:x:6666:

 			expected:  identity{UID: 1, GID: 5555},

 		},

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "GroupWithMap",

 			chownStr:  "0:unicorn",

 			idMapping: remapped,

@@ -106,7 +106,7 @@ othergrp:x:6666:

 			expected:  identity{UID: 100000, GID: 101002},

 		},

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "UserOnlyWithMap",

 			chownStr:  "unicorn",

 			idMapping: remapped,

@@ -131,7 +131,7 @@ othergrp:x:6666:

 		descr     string

 	}{

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "BadChownFlagFormat",

 			chownStr:  "bob:1:555",

 			idMapping: unmapped,

@@ -139,7 +139,7 @@ othergrp:x:6666:

 			descr:     "invalid chown string format: bob:1:555",

 		},

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "UserNoExist",

 			chownStr:  "bob",

 			idMapping: unmapped,

@@ -147,7 +147,7 @@ othergrp:x:6666:

 			descr:     "can't find uid for user bob: no such user: bob",

 		},

 		{

-			builder:   &Builder{options: &build.ImageBuildOptions{Platform: "linux"}},

+			builder:   &Builder{options: &buildbackend.BuildOptions{Platform: "linux"}},

 			name:      "GroupNoExist",

 			chownStr:  "root:bob",

 			idMapping: unmapped,

@@ -8,7 +8,6 @@ import (

 	"testing"

 	"github.com/moby/go-archive"

-	"github.com/moby/moby/api/types/build"

 	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/v2/daemon/builder"

 	"github.com/moby/moby/v2/daemon/builder/remotecontext"

@@ -76,7 +75,7 @@ func readAndCheckDockerfile(t *testing.T, testName, contextDir, dockerfilePath,

 	}

 	config := buildbackend.BuildConfig{

-		Options: &build.ImageBuildOptions{Dockerfile: dockerfilePath},

+		Options: &buildbackend.BuildOptions{Dockerfile: dockerfilePath},

 		Source:  tarStream,

 	}

 	_, _, err = remotecontext.Detect(config)

@@ -6,6 +6,7 @@ import (

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/moby/moby/api/types/build"

+	"github.com/moby/moby/api/types/container"

 	"github.com/moby/moby/api/types/filters"

 	"github.com/moby/moby/api/types/registry"

 )

@@ -48,7 +49,67 @@ type AuxEmitter interface {

 type BuildConfig struct {

 	Source         io.ReadCloser

 	ProgressWriter ProgressWriter

-	Options        *build.ImageBuildOptions

+	Options        *BuildOptions

+}

+

+// BuildOptions holds the information

+// necessary to build images.

+type BuildOptions struct {

+	Tags           []string

+	SuppressOutput bool

+	RemoteContext  string

+	NoCache        bool

+	Remove         bool

+	ForceRemove    bool

+	PullParent     bool

+	Isolation      container.Isolation

+	CPUSetCPUs     string

+	CPUSetMems     string

+	CPUShares      int64

+	CPUQuota       int64

+	CPUPeriod      int64

+	Memory         int64

+	MemorySwap     int64

+	CgroupParent   string

+	NetworkMode    string

+	ShmSize        int64

+	Dockerfile     string

+	Ulimits        []*container.Ulimit

+	// BuildArgs needs to be a *string instead of just a string so that

+	// we can tell the difference between "" (empty string) and no value

+	// at all (nil). See the parsing of buildArgs in

+	// api/server/router/build/build_routes.go for even more info.

+	BuildArgs   map[string]*string

+	AuthConfigs map[string]registry.AuthConfig

+	Context     io.Reader

+	Labels      map[string]string

+	// squash the resulting image's layers to the parent

+	// preserves the original image and creates a new one from the parent with all

+	// the changes applied to a single layer

+	Squash bool

+	// CacheFrom specifies images that are used for matching cache. Images

+	// specified here do not need to have a valid parent chain to match cache.

+	CacheFrom   []string

+	SecurityOpt []string

+	ExtraHosts  []string // List of extra hosts

+	Target      string

+	SessionID   string

+	Platform    string

+	// Version specifies the version of the underlying builder to use

+	Version build.BuilderVersion

+	// BuildID is an optional identifier that can be passed together with the

+	// build request. The same identifier can be used to gracefully cancel the

+	// build with the cancel request.

+	BuildID string

+	// Outputs defines configurations for exporting build results. Only supported

+	// in BuildKit mode

+	Outputs []BuildOutput

+}

+

+// BuildOutput defines configuration for exporting a build result

+type BuildOutput struct {

+	Type  string

+	Attrs map[string]string

 }

 // GetImageAndLayerOptions are the options supported by GetImageAndReleasableLayer

@@ -35,8 +35,8 @@ type invalidParam struct {

 func (e invalidParam) InvalidParameter() {}

-func newImageBuildOptions(ctx context.Context, r *http.Request) (*build.ImageBuildOptions, error) {

-	options := &build.ImageBuildOptions{

+func newImageBuildOptions(ctx context.Context, r *http.Request) (*buildbackend.BuildOptions, error) {

+	options := &buildbackend.BuildOptions{

 		Version:        build.BuilderV1, // Builder V1 is the default, but can be overridden

 		Dockerfile:     r.FormValue("dockerfile"),

 		SuppressOutput: httputils.BoolValue(r, "q"),

@@ -81,7 +81,7 @@ func newImageBuildOptions(ctx context.Context, r *http.Request) (*build.ImageBui

 	if versions.GreaterThanOrEqualTo(version, "1.40") {

 		outputsJSON := r.FormValue("outputs")

 		if outputsJSON != "" {

-			var outputs []build.ImageBuildOutput

+			var outputs []buildbackend.BuildOutput

 			if err := json.Unmarshal([]byte(outputsJSON), &outputs); err != nil {

 				return nil, invalidParam{errors.Wrap(err, "invalid outputs specified")}

 			}

@@ -7,7 +7,7 @@ import (

 	"strings"

 	"testing"

-	"github.com/moby/moby/api/types/build"

+	"github.com/moby/moby/client"

 	"github.com/moby/moby/client/pkg/jsonmessage"

 	"github.com/moby/moby/v2/integration/internal/requirement"

 	"github.com/moby/moby/v2/testutil"

@@ -51,14 +51,12 @@ func testBuildWithCgroupNs(ctx context.Context, t *testing.T, daemonNsMode strin

 	source := fakecontext.New(t, "", fakecontext.WithDockerfile(dockerfile))

 	defer source.Close()

-	client := d.NewClientT(t)

-	resp, err := client.ImageBuild(ctx,

-		source.AsTarReader(t),

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-			Tags:        []string{"buildcgroupns"},

-		})

+	apiClient := d.NewClientT(t)

+	resp, err := apiClient.ImageBuild(ctx, source.AsTarReader(t), client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+		Tags:        []string{"buildcgroupns"},

+	})

 	assert.NilError(t, err)

 	defer resp.Body.Close()

@@ -7,7 +7,6 @@ import (

 	"testing"

 	"github.com/moby/moby/api/pkg/stdcopy"

-	"github.com/moby/moby/api/types/build"

 	"github.com/moby/moby/client"

 	"github.com/moby/moby/v2/integration/internal/container"

 	"github.com/moby/moby/v2/testutil"

@@ -51,13 +50,11 @@ func TestBuildSquashParent(t *testing.T) {

 	defer source.Close()

 	name := strings.ToLower(t.Name())

-	resp, err := apiClient.ImageBuild(ctx,

-		source.AsTarReader(t),

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-			Tags:        []string{name},

-		})

+	resp, err := apiClient.ImageBuild(ctx, source.AsTarReader(t), client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+		Tags:        []string{name},

+	})

 	assert.NilError(t, err)

 	_, err = io.Copy(io.Discard, resp.Body)

 	resp.Body.Close()

@@ -70,7 +67,7 @@ func TestBuildSquashParent(t *testing.T) {

 	// build with squash

 	resp, err = apiClient.ImageBuild(ctx,

 		source.AsTarReader(t),

-		build.ImageBuildOptions{

+		client.ImageBuildOptions{

 			Remove:      true,

 			ForceRemove: true,

 			Squash:      true,

@@ -110,7 +110,7 @@ func TestBuildWithRemoveAndForceRemove(t *testing.T) {

 			_, err := tw.Write(dockerfile)

 			assert.NilError(t, err)

 			assert.NilError(t, tw.Close())

-			resp, err := apiClient.ImageBuild(ctx, buff, build.ImageBuildOptions{Remove: tc.rm, ForceRemove: tc.forceRm, NoCache: true})

+			resp, err := apiClient.ImageBuild(ctx, buff, client.ImageBuildOptions{Remove: tc.rm, ForceRemove: tc.forceRm, NoCache: true})

 			assert.NilError(t, err)

 			defer resp.Body.Close()

 			filter, err := buildContainerIdsFilter(resp.Body)

@@ -163,16 +163,12 @@ func TestBuildMultiStageCopy(t *testing.T) {

 		t.Run(target, func(t *testing.T) {

 			imgName := strings.ToLower(t.Name())

-			resp, err := apiclient.ImageBuild(

-				ctx,

-				source.AsTarReader(t),

-				build.ImageBuildOptions{

-					Remove:      true,

-					ForceRemove: true,

-					Target:      target,

-					Tags:        []string{imgName},

-				},

-			)

+			resp, err := apiclient.ImageBuild(ctx, source.AsTarReader(t), client.ImageBuildOptions{

+				Remove:      true,

+				ForceRemove: true,

+				Target:      target,

+				Tags:        []string{imgName},

+			})

 			assert.NilError(t, err)

 			out := bytes.NewBuffer(nil)

@@ -213,13 +209,11 @@ func TestBuildMultiStageParentConfig(t *testing.T) {

 	apiclient := testEnv.APIClient()

 	imgName := strings.ToLower(t.Name())

-	resp, err := apiclient.ImageBuild(ctx,

-		source.AsTarReader(t),

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-			Tags:        []string{imgName},

-		})

+	resp, err := apiclient.ImageBuild(ctx, source.AsTarReader(t), client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+		Tags:        []string{imgName},

+	})

 	assert.NilError(t, err)

 	_, err = io.Copy(io.Discard, resp.Body)

 	assert.Check(t, resp.Body.Close())

@@ -260,15 +254,13 @@ func TestBuildLabelWithTargets(t *testing.T) {

 	apiclient := testEnv.APIClient()

 	// For `target-a` build

-	resp, err := apiclient.ImageBuild(ctx,

-		source.AsTarReader(t),

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-			Tags:        []string{imgName},

-			Labels:      testLabels,

-			Target:      "target-a",

-		})

+	resp, err := apiclient.ImageBuild(ctx, source.AsTarReader(t), client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+		Tags:        []string{imgName},

+		Labels:      testLabels,

+		Target:      "target-a",

+	})

 	assert.NilError(t, err)

 	_, err = io.Copy(io.Discard, resp.Body)

 	assert.Check(t, resp.Body.Close())

@@ -289,7 +281,7 @@ func TestBuildLabelWithTargets(t *testing.T) {

 	delete(testLabels, "label-a")

 	resp, err = apiclient.ImageBuild(ctx,

 		source.AsTarReader(t),

-		build.ImageBuildOptions{

+		client.ImageBuildOptions{

 			Remove:      true,

 			ForceRemove: true,

 			Tags:        []string{imgName},

@@ -328,12 +320,10 @@ COPY    3/ /target/

 	defer source.Close()

 	apiclient := testEnv.APIClient()

-	resp, err := apiclient.ImageBuild(ctx,

-		source.AsTarReader(t),

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-		})

+	resp, err := apiclient.ImageBuild(ctx, source.AsTarReader(t), client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+	})

 	assert.NilError(t, err)

 	_, err = io.Copy(io.Discard, resp.Body)

 	assert.Check(t, resp.Body.Close())

@@ -364,12 +354,10 @@ RUN cat somefile`

 	defer source.Close()

 	apiclient := testEnv.APIClient()

-	resp, err := apiclient.ImageBuild(ctx,

-		source.AsTarReader(t),

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-		})

+	resp, err := apiclient.ImageBuild(ctx, source.AsTarReader(t), client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+	})

 	out := bytes.NewBuffer(nil)

 	assert.NilError(t, err)

@@ -410,12 +398,10 @@ COPY bar /

 	assert.NilError(t, err)

 	apiclient := testEnv.APIClient()

-	resp, err := apiclient.ImageBuild(ctx,

-		buf,

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-		})

+	resp, err := apiclient.ImageBuild(ctx, buf, client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+	})

 	out := bytes.NewBuffer(nil)

 	assert.NilError(t, err)

@@ -435,7 +421,7 @@ COPY bar /

 	resp, err = apiclient.ImageBuild(ctx,

 		buf,

-		build.ImageBuildOptions{

+		client.ImageBuildOptions{

 			Remove:      true,

 			ForceRemove: true,

 		})

@@ -472,12 +458,10 @@ RUN [ ! -f foo ]

 	defer source.Close()

 	apiClient := testEnv.APIClient()

-	resp, err := apiClient.ImageBuild(ctx,

-		source.AsTarReader(t),

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-		})

+	resp, err := apiClient.ImageBuild(ctx, source.AsTarReader(t), client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+	})

 	out := bytes.NewBuffer(nil)

 	assert.NilError(t, err)

@@ -518,12 +502,10 @@ RUN for g in $(seq 0 8); do dd if=/dev/urandom of=rnd bs=1K count=1 seek=$((1024

 	assert.NilError(t, err)

 	apiClient := testEnv.APIClient()

-	resp, err := apiClient.ImageBuild(ctx,

-		buf,

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-		})

+	resp, err := apiClient.ImageBuild(ctx, buf, client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+	})

 	out := bytes.NewBuffer(nil)

 	assert.NilError(t, err)

@@ -559,12 +541,10 @@ COPY --from=intermediate C:\\stuff C:\\stuff

 	assert.NilError(t, err)

 	apiClient := testEnv.APIClient()

-	resp, err := apiClient.ImageBuild(ctx,

-		buf,

-		build.ImageBuildOptions{

-			Remove:      true,

-			ForceRemove: true,

-		})

+	resp, err := apiClient.ImageBuild(ctx, buf, client.ImageBuildOptions{

+		Remove:      true,

+		ForceRemove: true,

+	})

 	out := bytes.NewBuffer(nil)

 	assert.NilError(t, err)

@@ -626,7 +606,7 @@ func TestBuildWithEmptyDockerfile(t *testing.T) {

 			_, err = apiClient.ImageBuild(ctx,

 				buf,

-				build.ImageBuildOptions{

+				client.ImageBuildOptions{

 					Remove:      true,

 					ForceRemove: true,