@@ -130,12 +130,6 @@ type ImageBuildResponse struct {

 	OSType string

 }

-// ImageImportSource holds source information for ImageImport

-type ImageImportSource struct {

-	Source     io.Reader // Source is the data to send to the server to create this image from. You must set SourceName to "-" to leverage this.

-	SourceName string    // SourceName is the name of the image to pull. Set to "-" to leverage the Source attribute.

-}

-

 // ImageLoadResponse returns information to the client about a load process.

 type ImageLoadResponse struct {

 	// Body must be closed to avoid a resource leak

@@ -2,10 +2,17 @@ package image

 import (

 	"context"

+	"io"

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

 )

+// ImportSource holds source information for ImageImport

+type ImportSource struct {

+	Source     io.Reader // Source is the data to send to the server to create this image from. You must set SourceName to "-" to leverage this.

+	SourceName string    // SourceName is the name of the image to pull. Set to "-" to leverage the Source attribute.

+}

+

 // ImportOptions holds information to import images from the client host.

 type ImportOptions struct {

 	Tag      string   // Tag is the name to tag this image with. This attribute is deprecated.

@@ -123,3 +123,8 @@ type EventsOptions = events.ListOptions

 //

 // Deprecated: use [registry.SearchOptions].

 type ImageSearchOptions = registry.SearchOptions

+

+// ImageImportSource holds source information for ImageImport

+//

+// Deprecated: use [image.ImportSource].

+type ImageImportSource image.ImportSource

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

 	"strings"

 	"github.com/distribution/reference"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/image"

 )

 // ImageImport creates a new image based on the source options.

 // It returns the JSON content in the response body.

-func (cli *Client) ImageImport(ctx context.Context, source types.ImageImportSource, ref string, options image.ImportOptions) (io.ReadCloser, error) {

+func (cli *Client) ImageImport(ctx context.Context, source image.ImportSource, ref string, options image.ImportOptions) (io.ReadCloser, error) {

 	if ref != "" {

 		// Check if the given image name can be resolved

 		if _, err := reference.ParseNormalizedNamed(ref); err != nil {

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

 	"strings"

 	"testing"

-	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/image"

 	"github.com/docker/docker/errdefs"

 	"gotest.tools/v3/assert"

@@ -21,7 +20,7 @@ func TestImageImportError(t *testing.T) {

 	client := &Client{

 		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),

 	}

-	_, err := client.ImageImport(context.Background(), types.ImageImportSource{}, "image:tag", image.ImportOptions{})

+	_, err := client.ImageImport(context.Background(), image.ImportSource{}, "image:tag", image.ImportOptions{})

 	assert.Check(t, is.ErrorType(err, errdefs.IsSystem))

 }

@@ -61,7 +60,7 @@ func TestImageImport(t *testing.T) {

 			}, nil

 		}),

 	}

-	importResponse, err := client.ImageImport(context.Background(), types.ImageImportSource{

+	importResponse, err := client.ImageImport(context.Background(), image.ImportSource{

 		Source:     strings.NewReader("source"),

 		SourceName: "image_source",

 	}, "repository_name:imported", image.ImportOptions{

@@ -92,7 +92,7 @@ type ImageAPIClient interface {

 	BuildCancel(ctx context.Context, id string) error

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

 	ImageHistory(ctx context.Context, image string) ([]image.HistoryResponseItem, error)

-	ImageImport(ctx context.Context, source types.ImageImportSource, ref string, options image.ImportOptions) (io.ReadCloser, error)

+	ImageImport(ctx context.Context, source image.ImportSource, ref string, options image.ImportOptions) (io.ReadCloser, error)

 	ImageInspectWithRaw(ctx context.Context, image string) (types.ImageInspect, []byte, error)

 	ImageList(ctx context.Context, options image.ListOptions) ([]image.Summary, error)

 	ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error)

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

 	"testing"

 	"time"

-	"github.com/docker/docker/api/types"

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

 	"github.com/docker/docker/api/types/image"

 	"github.com/docker/docker/integration/internal/container"

@@ -32,7 +31,7 @@ func TestExportContainerAndImportImage(t *testing.T) {

 	reference := "repo/" + strings.ToLower(t.Name()) + ":v1"

 	exportResp, err := apiClient.ContainerExport(ctx, cID)

 	assert.NilError(t, err)

-	importResp, err := apiClient.ImageImport(ctx, types.ImageImportSource{

+	importResp, err := apiClient.ImageImport(ctx, image.ImportSource{

 		Source:     exportResp,

 		SourceName: "-",

 	}, reference, image.ImportOptions{})

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

 	"strings"

 	"testing"

-	"github.com/docker/docker/api/types"

 	imagetypes "github.com/docker/docker/api/types/image"

 	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/image"

@@ -48,7 +47,7 @@ func TestImportExtremelyLargeImageWorks(t *testing.T) {

 	reference := strings.ToLower(t.Name()) + ":v42"

 	_, err = client.ImageImport(ctx,

-		types.ImageImportSource{Source: imageRdr, SourceName: "-"},

+		imagetypes.ImportSource{Source: imageRdr, SourceName: "-"},

 		reference,

 		imagetypes.ImportOptions{})

 	assert.NilError(t, err)

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

 			reference := "import-with-platform:tc-" + strconv.Itoa(i)

 			_, err = client.ImageImport(ctx,

-				types.ImageImportSource{Source: imageRdr, SourceName: "-"},

+				imagetypes.ImportSource{Source: imageRdr, SourceName: "-"},

 				reference,

 				imagetypes.ImportOptions{Platform: tc.platform})

 			assert.NilError(t, err)

@@ -177,7 +176,7 @@ func TestImportWithCustomPlatformReject(t *testing.T) {

 			ctx := testutil.StartSpan(ctx, t)

 			reference := "import-with-platform:tc-" + strconv.Itoa(i)

 			_, err = client.ImageImport(ctx,

-				types.ImageImportSource{Source: imageRdr, SourceName: "-"},

+				imagetypes.ImportSource{Source: imageRdr, SourceName: "-"},

 				reference,

 				imagetypes.ImportOptions{Platform: tc.platform})

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

 	"testing"

 	"time"

-	"github.com/docker/docker/api/types"

 	containertypes "github.com/docker/docker/api/types/container"

 	eventtypes "github.com/docker/docker/api/types/events"

 	"github.com/docker/docker/api/types/image"

@@ -463,7 +462,7 @@ func imageImport(ctx context.Context, client client.APIClient, path string) erro

 	defer file.Close()

 	options := image.ImportOptions{}

 	ref := ""

-	source := types.ImageImportSource{

+	source := image.ImportSource{

 		Source:     file,

 		SourceName: "-",

 	}