@@ -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=",

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

 	buildkit "github.com/moby/moby/v2/daemon/internal/builder-next"

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

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

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

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

 	"github.com/pkg/errors"

 	"google.golang.org/grpc"

@@ -27,7 +26,7 @@ type ImageComponent interface {

 // Builder defines interface for running a build

 type Builder interface {

-	Build(context.Context, backend.BuildConfig) (*builder.Result, error)

+	Build(context.Context, buildbackend.BuildConfig) (*builder.Result, error)

 }

 // Backend provides build functionality to the API router

@@ -51,7 +50,7 @@ func (b *Backend) RegisterGRPC(s *grpc.Server) {

 }

 // Build builds an image from a Source

-func (b *Backend) Build(ctx context.Context, config backend.BuildConfig) (string, error) {

+func (b *Backend) Build(ctx context.Context, config buildbackend.BuildConfig) (string, error) {

 	options := config.Options

 	useBuildKit := options.Version == build.BuilderBuildKit

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

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

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

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

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

 	"github.com/opencontainers/go-digest"

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

 )

@@ -52,7 +53,7 @@ type Backend interface {

 // ImageBackend are the interface methods required from an image component

 type ImageBackend interface {

-	GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts backend.GetImageAndLayerOptions) (Image, ROLayer, error)

+	GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts buildbackend.GetImageAndLayerOptions) (Image, ROLayer, error)

 }

 // ExecBackend contains the interface methods required for executing containers

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

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

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

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

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

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

 	"github.com/moby/moby/v2/errdefs"

 	"github.com/moby/sys/user"

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

@@ -62,7 +62,7 @@ func NewBuildManager(b builder.Backend, identityMapping user.IdentityMapping) (*

 }

 // Build starts a new build from a BuildConfig

-func (bm *BuildManager) Build(ctx context.Context, config backend.BuildConfig) (*builder.Result, error) {

+func (bm *BuildManager) Build(ctx context.Context, config buildbackend.BuildConfig) (*builder.Result, error) {

 	buildsTriggered.Inc()

 	if config.Options.Dockerfile == "" {

 		config.Options.Dockerfile = builder.DefaultDockerfileName

@@ -98,9 +98,9 @@ func (bm *BuildManager) Build(ctx context.Context, config backend.BuildConfig) (

 // builderOptions are the dependencies required by the builder

 type builderOptions struct {

-	Options        *build.ImageBuildOptions

+	Options        *buildbackend.BuildOptions

 	Backend        builder.Backend

-	ProgressWriter backend.ProgressWriter

+	ProgressWriter buildbackend.ProgressWriter

 	PathCache      pathCache

 	IDMapping      user.IdentityMapping

 }

@@ -108,11 +108,11 @@ 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

-	Aux    backend.AuxEmitter

+	Aux    buildbackend.AuxEmitter

 	Output io.Writer

 	docker builder.Backend

@@ -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)

@@ -217,7 +217,7 @@ func (b *Builder) build(ctx context.Context, source builder.Source, dockerfile *

 	return &builder.Result{ImageID: state.imageID, FromImage: state.baseImage}, nil

 }

-func emitImageID(aux backend.AuxEmitter, state *dispatchState) error {

+func emitImageID(aux buildbackend.AuxEmitter, state *dispatchState) error {

 	if aux == nil || state.imageID == "" {

 		return nil

 	}

@@ -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,

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

 	"github.com/containerd/platforms"

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

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

-	"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"

 )

@@ -25,15 +25,15 @@ type imageSources struct {

 func newImageSources(options builderOptions) *imageSources {

 	getAndMount := func(ctx context.Context, idOrRef string, localOnly bool, platform *ocispec.Platform) (builder.Image, builder.ROLayer, error) {

-		pullOption := backend.PullOptionNoPull

+		pullOption := buildbackend.PullOptionNoPull

 		if !localOnly {

 			if options.Options.PullParent {

-				pullOption = backend.PullOptionForcePull

+				pullOption = buildbackend.PullOptionForcePull

 			} else {

-				pullOption = backend.PullOptionPreferLocal

+				pullOption = buildbackend.PullOptionPreferLocal

 			}

 		}

-		return options.Backend.GetImageAndReleasableLayer(ctx, idOrRef, backend.GetImageAndLayerOptions{

+		return options.Backend.GetImageAndReleasableLayer(ctx, idOrRef, buildbackend.GetImageAndLayerOptions{

 			PullOption: pullOption,

 			AuthConfig: options.Options.AuthConfigs,

 			Output:     options.ProgressWriter.Output,

@@ -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,13 +8,12 @@ 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"

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

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

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

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

 	"github.com/opencontainers/go-digest"

 	"gotest.tools/v3/assert"

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

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

 		dockerfilePath = builder.DefaultDockerfileName

 	}

-	config := backend.BuildConfig{

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

+	config := buildbackend.BuildConfig{

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

 		Source:  tarStream,

 	}

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

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

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

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

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

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

 	"github.com/opencontainers/go-digest"

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

 )

@@ -62,7 +63,7 @@ func (m *MockBackend) CopyOnBuild(containerID string, destPath string, srcRoot s

 	return nil

 }

-func (m *MockBackend) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts backend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error) {

+func (m *MockBackend) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts buildbackend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error) {

 	if m.getImageFunc != nil {

 		return m.getImageFunc(refOrID)

 	}

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

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

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

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

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

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

 	"github.com/moby/moby/v2/errdefs"

 	"github.com/moby/patternmatcher"

 	"github.com/moby/patternmatcher/ignorefile"

@@ -28,7 +28,7 @@ const ClientSessionRemote = "client-session"

 // Detect returns a context and dockerfile from remote location or local

 // archive.

-func Detect(config backend.BuildConfig) (remote builder.Source, dockerfile *parser.Result, _ error) {

+func Detect(config buildbackend.BuildConfig) (remote builder.Source, dockerfile *parser.Result, _ error) {

 	remoteURL := config.Options.RemoteContext

 	switch {

 	case remoteURL == "":

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

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

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

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

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

 	"github.com/moby/moby/v2/errdefs"

 	"github.com/opencontainers/go-digest"

 	"github.com/opencontainers/image-spec/identity"

@@ -64,7 +65,7 @@ const (

 // GetImageAndReleasableLayer returns an image and releaseable layer for a

 // reference or ID. Every call to GetImageAndReleasableLayer MUST call

 // releasableLayer.Release() to prevent leaking of layers.

-func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts backend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error) {

+func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts buildbackend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error) {

 	if refOrID == "" { // FROM scratch

 		if runtime.GOOS == "windows" {

 			return nil, nil, errors.New(`"FROM scratch" is not supported on Windows`)

@@ -80,10 +81,10 @@ func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID s

 		}, nil

 	}

-	if opts.PullOption != backend.PullOptionForcePull {

+	if opts.PullOption != buildbackend.PullOptionForcePull {

 		// TODO(laurazard): same as below

 		img, err := i.GetImage(ctx, refOrID, backend.GetImageOpts{Platform: opts.Platform})

-		if err != nil && opts.PullOption == backend.PullOptionNoPull {

+		if err != nil && opts.PullOption == buildbackend.PullOptionNoPull {

 			return nil, nil, err

 		}

 		imgDesc, err := i.resolveDescriptor(ctx, refOrID)

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

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

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

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

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

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

 	"github.com/opencontainers/go-digest"

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

@@ -48,7 +49,7 @@ type ImageService interface {

 	// Layers

-	GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts backend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error)

+	GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts buildbackend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error)

 	CreateLayer(container *container.Container, initFunc layer.MountInit) (container.RWLayer, error)

 	CreateLayerFromImage(img *image.Image, layerName string, rwLayerOpts *layer.CreateRWLayerOpts) (container.RWLayer, error)

 	GetLayerByID(cid string) (container.RWLayer, error)

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

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

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

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

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

 	"github.com/opencontainers/go-digest"

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

 	"github.com/pkg/errors"

@@ -195,7 +196,7 @@ Please notify the image author to correct the configuration.`,

 // GetImageAndReleasableLayer returns an image and releaseable layer for a reference or ID.

 // Every call to GetImageAndReleasableLayer MUST call releasableLayer.Release() to prevent

 // leaking of layers.

-func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts backend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error) {

+func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID string, opts buildbackend.GetImageAndLayerOptions) (builder.Image, builder.ROLayer, error) {

 	if refOrID == "" { // FROM scratch

 		if runtime.GOOS == "windows" {

 			return nil, nil, errors.New(`"FROM scratch" is not supported on Windows`)

@@ -209,9 +210,9 @@ func (i *ImageService) GetImageAndReleasableLayer(ctx context.Context, refOrID s

 		return nil, lyr, err

 	}

-	if opts.PullOption != backend.PullOptionForcePull {

+	if opts.PullOption != buildbackend.PullOptionForcePull {

 		img, err := i.GetImage(ctx, refOrID, backend.GetImageOpts{Platform: opts.Platform})

-		if err != nil && opts.PullOption == backend.PullOptionNoPull {

+		if err != nil && opts.PullOption == buildbackend.PullOptionNoPull {

 			return nil, nil, err

 		}

 		if err != nil && !cerrdefs.IsNotFound(err) {

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

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

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

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

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

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

 	"github.com/moby/moby/v2/errdefs"

 	"github.com/moby/sys/user"

@@ -243,7 +242,7 @@ func (b *Builder) Prune(ctx context.Context, opts buildbackend.CachePruneOptions

 }

 // Build executes a build request

-func (b *Builder) Build(ctx context.Context, opt backend.BuildConfig) (*builder.Result, error) {

+func (b *Builder) Build(ctx context.Context, opt buildbackend.BuildConfig) (*builder.Result, error) {

 	if len(opt.Options.Outputs) > 1 {

 		return nil, errors.Errorf("multiple outputs not supported")

 	}

deleted file mode 100644

@@ -1,50 +0,0 @@

-package backend

-

-import (

-	"io"

-

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

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

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

-)

-

-// PullOption defines different modes for accessing images

-type PullOption int

-

-const (

-	// PullOptionNoPull only returns local images

-	PullOptionNoPull PullOption = iota

-	// PullOptionForcePull always tries to pull a ref from the registry first

-	PullOptionForcePull

-	// PullOptionPreferLocal uses local image if it exists, otherwise pulls

-	PullOptionPreferLocal

-)

-

-// ProgressWriter is a data object to transport progress streams to the client

-type ProgressWriter struct {

-	Output             io.Writer

-	StdoutFormatter    io.Writer

-	StderrFormatter    io.Writer

-	AuxFormatter       AuxEmitter

-	ProgressReaderFunc func(io.ReadCloser) io.ReadCloser

-}

-

-// AuxEmitter is an interface for emitting aux messages during build progress

-type AuxEmitter interface {

-	Emit(string, any) error

-}

-

-// BuildConfig is the configuration used by a BuildManager to start a build

-type BuildConfig struct {

-	Source         io.ReadCloser

-	ProgressWriter ProgressWriter

-	Options        *build.ImageBuildOptions

-}

-

-// GetImageAndLayerOptions are the options supported by GetImageAndReleasableLayer

-type GetImageAndLayerOptions struct {

-	PullOption PullOption

-	AuthConfig map[string]registry.AuthConfig

-	Output     io.Writer

-	Platform   *ocispec.Platform

-}

@@ -1,6 +1,15 @@

 package buildbackend

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

+import (

+	"io"

+

+	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"

+)

 type CachePruneOptions struct {

 	All           bool

@@ -9,3 +18,104 @@ type CachePruneOptions struct {

 	MinFreeSpace  int64

 	Filters       filters.Args

 }

+

+// PullOption defines different modes for accessing images

+type PullOption int

+

+const (

+	// PullOptionNoPull only returns local images

+	PullOptionNoPull PullOption = iota

+	// PullOptionForcePull always tries to pull a ref from the registry first

+	PullOptionForcePull

+	// PullOptionPreferLocal uses local image if it exists, otherwise pulls

+	PullOptionPreferLocal

+)

+

+// ProgressWriter is a data object to transport progress streams to the client

+type ProgressWriter struct {

+	Output             io.Writer

+	StdoutFormatter    io.Writer

+	StderrFormatter    io.Writer

+	AuxFormatter       AuxEmitter

+	ProgressReaderFunc func(io.ReadCloser) io.ReadCloser

+}

+

+// AuxEmitter is an interface for emitting aux messages during build progress

+type AuxEmitter interface {

+	Emit(string, any) error

+}

+

+// BuildConfig is the configuration used by a BuildManager to start a build

+type BuildConfig struct {

+	Source         io.ReadCloser

+	ProgressWriter ProgressWriter

+	Options        *BuildOptions

+}

+

+// BuildOptions holds the information

+// necessary to build images.