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

 	"io"

 	"os"

 	"time"

+

+	"github.com/docker/docker/api/types/mount"

 )

 // PruneReport contains the response for Engine API:

@@ -42,3 +44,47 @@ type StatsResponseReader struct {

 	Body   io.ReadCloser `json:"body"`

 	OSType string        `json:"ostype"`

 }

+

+// MountPoint represents a mount point configuration inside the container.

+// This is used for reporting the mountpoints in use by a container.

+type MountPoint struct {

+	// Type is the type of mount, see `Type<foo>` definitions in

+	// github.com/docker/docker/api/types/mount.Type

+	Type mount.Type `json:",omitempty"`

+

+	// Name is the name reference to the underlying data defined by `Source`

+	// e.g., the volume name.

+	Name string `json:",omitempty"`

+

+	// Source is the source location of the mount.

+	//

+	// For volumes, this contains the storage location of the volume (within

+	// `/var/lib/docker/volumes/`). For bind-mounts, and `npipe`, this contains

+	// the source (host) part of the bind-mount. For `tmpfs` mount points, this

+	// field is empty.

+	Source string

+

+	// Destination is the path relative to the container root (`/`) where the

+	// Source is mounted inside the container.

+	Destination string

+

+	// Driver is the volume driver used to create the volume (if it is a volume).

+	Driver string `json:",omitempty"`

+

+	// Mode is a comma separated list of options supplied by the user when

+	// creating the bind/volume mount.

+	//

+	// The default is platform-specific (`"z"` on Linux, empty on Windows).

+	Mode string

+

+	// RW indicates whether the mount is mounted writable (read-write).

+	RW bool

+

+	// Propagation describes how mounts are propagated from the host into the

+	// mount point, and vice-versa. Refer to the Linux kernel documentation

+	// for details:

+	// https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt

+	//

+	// This field is not used on Windows.

+	Propagation mount.Propagation

+}

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

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

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

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

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

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

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

 )

@@ -155,7 +154,7 @@ type Container struct {

 		Annotations map[string]string `json:",omitempty"`

 	}

 	NetworkSettings *container.NetworkSettingsSummary

-	Mounts          []MountPoint

+	Mounts          []container.MountPoint

 }

 // Ping contains response of Engine API:

@@ -251,55 +250,11 @@ type ContainerJSONBase struct {

 // ContainerJSON is newly used struct along with MountPoint

 type ContainerJSON struct {

 	*ContainerJSONBase

-	Mounts          []MountPoint

+	Mounts          []container.MountPoint

 	Config          *container.Config

 	NetworkSettings *container.NetworkSettings

 }

-// MountPoint represents a mount point configuration inside the container.

-// This is used for reporting the mountpoints in use by a container.

-type MountPoint struct {

-	// Type is the type of mount, see `Type<foo>` definitions in

-	// github.com/docker/docker/api/types/mount.Type

-	Type mount.Type `json:",omitempty"`

-

-	// Name is the name reference to the underlying data defined by `Source`

-	// e.g., the volume name.

-	Name string `json:",omitempty"`

-

-	// Source is the source location of the mount.

-	//

-	// For volumes, this contains the storage location of the volume (within

-	// `/var/lib/docker/volumes/`). For bind-mounts, and `npipe`, this contains

-	// the source (host) part of the bind-mount. For `tmpfs` mount points, this

-	// field is empty.

-	Source string

-

-	// Destination is the path relative to the container root (`/`) where the

-	// Source is mounted inside the container.

-	Destination string

-

-	// Driver is the volume driver used to create the volume (if it is a volume).

-	Driver string `json:",omitempty"`

-

-	// Mode is a comma separated list of options supplied by the user when

-	// creating the bind/volume mount.

-	//

-	// The default is platform-specific (`"z"` on Linux, empty on Windows).

-	Mode string

-

-	// RW indicates whether the mount is mounted writable (read-write).

-	RW bool

-

-	// Propagation describes how mounts are propagated from the host into the

-	// mount point, and vice-versa. Refer to the Linux kernel documentation

-	// for details:

-	// https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt

-	//

-	// This field is not used on Windows.

-	Propagation mount.Propagation

-}

-

 // DiskUsageObject represents an object type used for disk usage query filtering.

 type DiskUsageObject string

@@ -249,3 +249,9 @@ type Health = container.Health

 //

 // Deprecated: use [container.HealthcheckResult].

 type HealthcheckResult = container.HealthcheckResult

+

+// MountPoint represents a mount point configuration inside the container.

+// This is used for reporting the mountpoints in use by a container.

+//

+// Deprecated: use [container.MountPoint].

+type MountPoint = container.MountPoint

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

 	"github.com/containerd/continuity/fs"

 	"github.com/containerd/log"

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

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

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

 	mounttypes "github.com/docker/docker/api/types/mount"

@@ -432,10 +431,10 @@ func (container *Container) TmpfsMounts() ([]Mount, error) {

 }

 // GetMountPoints gives a platform specific transformation to types.MountPoint. Callers must hold a Container lock.

-func (container *Container) GetMountPoints() []types.MountPoint {

-	mountPoints := make([]types.MountPoint, 0, len(container.MountPoints))

+func (container *Container) GetMountPoints() []containertypes.MountPoint {

+	mountPoints := make([]containertypes.MountPoint, 0, len(container.MountPoints))

 	for _, m := range container.MountPoints {

-		mountPoints = append(mountPoints, types.MountPoint{

+		mountPoints = append(mountPoints, containertypes.MountPoint{

 			Type:        m.Type,

 			Name:        m.Name,

 			Source:      m.Path(),

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

 	"os"

 	"path/filepath"

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

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

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

 	swarmtypes "github.com/docker/docker/api/types/swarm"

@@ -188,10 +187,10 @@ func (container *Container) BuildHostnameFile() error {

 }

 // GetMountPoints gives a platform specific transformation to types.MountPoint. Callers must hold a Container lock.

-func (container *Container) GetMountPoints() []types.MountPoint {

-	mountPoints := make([]types.MountPoint, 0, len(container.MountPoints))

+func (container *Container) GetMountPoints() []containertypes.MountPoint {

+	mountPoints := make([]containertypes.MountPoint, 0, len(container.MountPoints))

 	for _, m := range container.MountPoints {

-		mountPoints = append(mountPoints, types.MountPoint{

+		mountPoints = append(mountPoints, containertypes.MountPoint{

 			Type:        m.Type,

 			Name:        m.Name,

 			Source:      m.Path(),

@@ -463,7 +463,7 @@ func includeContainerInList(container *container.Snapshot, filter *listContext)

 	}

 	if filter.filters.Contains("volume") {

-		volumesByName := make(map[string]types.MountPoint)

+		volumesByName := make(map[string]containertypes.MountPoint)

 		for _, m := range container.Mounts {

 			if m.Name != "" {

 				volumesByName[m.Name] = m

@@ -471,7 +471,7 @@ func includeContainerInList(container *container.Snapshot, filter *listContext)

 				volumesByName[m.Source] = m

 			}

 		}

-		volumesByDestination := make(map[string]types.MountPoint)

+		volumesByDestination := make(map[string]containertypes.MountPoint)

 		for _, m := range container.Mounts {

 			if m.Destination != "" {

 				volumesByDestination[m.Destination] = m

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

 	"testing"

 	"time"

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

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

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

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

@@ -1807,7 +1806,7 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 	type testCase struct {

 		spec     mount.Mount

-		expected types.MountPoint

+		expected container.MountPoint

 	}

 	var selinuxSharedLabel string

@@ -1820,23 +1819,23 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 		// Validation of the actual `Mount` struct is done in another test is not needed here

 		{

 			spec:     mount.Mount{Type: "volume", Target: destPath},

-			expected: types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

+			expected: container.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

 		},

 		{

 			spec:     mount.Mount{Type: "volume", Target: destPath + slash},

-			expected: types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

+			expected: container.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

 		},

 		{

 			spec:     mount.Mount{Type: "volume", Target: destPath, Source: "test1"},

-			expected: types.MountPoint{Type: "volume", Name: "test1", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

+			expected: container.MountPoint{Type: "volume", Name: "test1", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

 		},

 		{

 			spec:     mount.Mount{Type: "volume", Target: destPath, ReadOnly: true, Source: "test2"},

-			expected: types.MountPoint{Type: "volume", Name: "test2", RW: false, Destination: destPath, Mode: selinuxSharedLabel},

+			expected: container.MountPoint{Type: "volume", Name: "test2", RW: false, Destination: destPath, Mode: selinuxSharedLabel},

 		},

 		{

 			spec:     mount.Mount{Type: "volume", Target: destPath, Source: "test3", VolumeOptions: &mount.VolumeOptions{DriverConfig: &mount.Driver{Name: volume.DefaultDriverName}}},

-			expected: types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", Name: "test3", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

+			expected: container.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", Name: "test3", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

 		},

 	}

@@ -1852,7 +1851,7 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 					Source: tmpDir1,

 					Target: destPath,

 				},

-				expected: types.MountPoint{

+				expected: container.MountPoint{

 					Type:        "bind",

 					RW:          true,

 					Destination: destPath,

@@ -1861,7 +1860,7 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 			},

 			{

 				spec:     mount.Mount{Type: "bind", Source: tmpDir1, Target: destPath, ReadOnly: true},

-				expected: types.MountPoint{Type: "bind", RW: false, Destination: destPath, Source: tmpDir1},

+				expected: container.MountPoint{Type: "bind", RW: false, Destination: destPath, Source: tmpDir1},

 			},

 		}...)

@@ -1875,15 +1874,15 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 				cases = append(cases, []testCase{

 					{

 						spec:     mount.Mount{Type: "bind", Source: tmpDir3, Target: destPath},

-						expected: types.MountPoint{Type: "bind", RW: true, Destination: destPath, Source: tmpDir3},

+						expected: container.MountPoint{Type: "bind", RW: true, Destination: destPath, Source: tmpDir3},

 					},

 					{

 						spec:     mount.Mount{Type: "bind", Source: tmpDir3, Target: destPath, ReadOnly: true},

-						expected: types.MountPoint{Type: "bind", RW: false, Destination: destPath, Source: tmpDir3},

+						expected: container.MountPoint{Type: "bind", RW: false, Destination: destPath, Source: tmpDir3},

 					},

 					{

 						spec:     mount.Mount{Type: "bind", Source: tmpDir3, Target: destPath, ReadOnly: true, BindOptions: &mount.BindOptions{Propagation: "shared"}},

-						expected: types.MountPoint{Type: "bind", RW: false, Destination: destPath, Source: tmpDir3, Propagation: "shared"},

+						expected: container.MountPoint{Type: "bind", RW: false, Destination: destPath, Source: tmpDir3, Propagation: "shared"},

 					},

 				}...)

 			}

@@ -1894,19 +1893,19 @@ func (s *DockerAPISuite) TestContainersAPICreateMountsCreate(c *testing.T) {

 		cases = append(cases, []testCase{

 			{

 				spec:     mount.Mount{Type: "volume", Target: destPath, VolumeOptions: &mount.VolumeOptions{NoCopy: true}},

-				expected: types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

+				expected: container.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

 			},

 			{

 				spec:     mount.Mount{Type: "volume", Target: destPath + slash, VolumeOptions: &mount.VolumeOptions{NoCopy: true}},

-				expected: types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

+				expected: container.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

 			},

 			{

 				spec:     mount.Mount{Type: "volume", Target: destPath, Source: "test4", VolumeOptions: &mount.VolumeOptions{NoCopy: true}},

-				expected: types.MountPoint{Type: "volume", Name: "test4", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

+				expected: container.MountPoint{Type: "volume", Name: "test4", RW: true, Destination: destPath, Mode: selinuxSharedLabel},

 			},

 			{

 				spec:     mount.Mount{Type: "volume", Target: destPath, Source: "test5", ReadOnly: true, VolumeOptions: &mount.VolumeOptions{NoCopy: true}},

-				expected: types.MountPoint{Type: "volume", Name: "test5", RW: false, Destination: destPath, Mode: selinuxSharedLabel},

+				expected: container.MountPoint{Type: "volume", Name: "test5", RW: false, Destination: destPath, Mode: selinuxSharedLabel},

 			},

 		}...)

 	}

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

 	"testing"

 	"time"

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

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

 	volumetypes "github.com/docker/docker/api/types/volume"

 	"github.com/docker/docker/integration-cli/cli"

 	"github.com/docker/docker/integration-cli/daemon"

@@ -494,7 +494,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverWithDaemonRestart(c

 	s.d.Restart(c)

 	cli.DockerCmd(c, "run", "--name=test", "-v", "abc1:/foo", "busybox", "true")

-	var mounts []types.MountPoint

+	var mounts []container.MountPoint

 	inspectFieldAndUnmarshall(c, "test", "Mounts", &mounts)

 	assert.Equal(c, len(mounts), 1)

 	assert.Equal(c, mounts[0].Driver, volumePluginName)

@@ -194,7 +194,7 @@ func (s *DockerCLIInspectSuite) TestInspectBindMountPoint(c *testing.T) {

 	vol := inspectFieldJSON(c, "test", "Mounts")

-	var mp []types.MountPoint

+	var mp []container.MountPoint

 	err := json.Unmarshal([]byte(vol), &mp)

 	assert.NilError(c, err)

@@ -218,7 +218,7 @@ func (s *DockerCLIInspectSuite) TestInspectNamedMountPoint(c *testing.T) {

 	vol := inspectFieldJSON(c, "test", "Mounts")

-	var mp []types.MountPoint

+	var mp []container.MountPoint

 	err := json.Unmarshal([]byte(vol), &mp)

 	assert.NilError(c, err)

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

 	"strings"

 	"testing"

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

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

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

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

 	"github.com/docker/docker/integration-cli/checker"

@@ -57,7 +57,7 @@ func (s *DockerSwarmSuite) TestServiceCreateMountVolume(c *testing.T) {

 	out, err = s.nodeCmd(c, task.NodeID, "inspect", "--format", "{{json .Mounts}}", task.Status.ContainerStatus.ContainerID)

 	assert.NilError(c, err, out)

-	var mounts []types.MountPoint

+	var mounts []container.MountPoint

 	assert.Assert(c, json.Unmarshal([]byte(out), &mounts) == nil)

 	assert.Equal(c, len(mounts), 1)

@@ -407,7 +407,7 @@ func (s *DockerSwarmSuite) TestServiceCreateMountTmpfs(c *testing.T) {

 	out, err = s.nodeCmd(c, task.NodeID, "inspect", "--format", "{{json .Mounts}}", task.Status.ContainerStatus.ContainerID)

 	assert.NilError(c, err, out)

-	var mounts []types.MountPoint

+	var mounts []container.MountPoint

 	assert.Assert(c, json.Unmarshal([]byte(out), &mounts) == nil)

 	assert.Equal(c, len(mounts), 1)

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

 	"time"

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

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/cli"

 	"github.com/docker/docker/integration-cli/daemon"

@@ -131,18 +132,18 @@ func inspectMountSourceField(name, destination string) (string, error) {

 var errMountNotFound = errors.New("mount point not found")

 // Deprecated: use cli.Docker

-func inspectMountPoint(name, destination string) (types.MountPoint, error) {

+func inspectMountPoint(name, destination string) (container.MountPoint, error) {

 	out, err := inspectFilter(name, "json .Mounts")

 	if err != nil {

-		return types.MountPoint{}, err

+		return container.MountPoint{}, err

 	}

-	var mp []types.MountPoint

+	var mp []container.MountPoint

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

-		return types.MountPoint{}, err

+		return container.MountPoint{}, err

 	}

-	var m *types.MountPoint

+	var m *container.MountPoint

 	for _, c := range mp {

 		if c.Destination == destination {

 			m = &c

@@ -151,7 +152,7 @@ func inspectMountPoint(name, destination string) (types.MountPoint, error) {

 	}

 	if m == nil {

-		return types.MountPoint{}, errMountNotFound

+		return container.MountPoint{}, errMountNotFound

 	}

 	return *m, nil