Merge pull request #50446 from dmcgowan/move-image-daemon

Move remaining image packages to daemon

.golangci.yml

@@ -103,7 +103,7 @@ linters:
           msg: Go 1.19 atomic types should be used instead.
         - pkg: ^regexp$
           pattern: ^regexp\.MustCompile
-          msg: Use internal/lazyregexp.New instead.
+          msg: Use daemon/internal/lazyregexp.New instead.
         - pkg: github.com/vishvananda/netlink$
           pattern: ^netlink\.(Handle\.)?(AddrList|BridgeVlanList|ChainList|ClassList|ConntrackTableList|ConntrackDeleteFilter$|ConntrackDeleteFilters|DevLinkGetDeviceList|DevLinkGetAllPortList|DevlinkGetDeviceParams|FilterList|FouList|GenlFamilyList|GTPPDPList|LinkByName|LinkByAlias|LinkList|LinkSubscribeWithOptions|NeighList$|NeighProxyList|NeighListExecute|NeighSubscribeWithOptions|LinkGetProtinfo|QdiscList|RdmaLinkList|RdmaLinkByName|RdmaLinkDel|RouteList|RouteListFilteredIter|RuleListFiltered$|RouteSubscribeWithOptions|RuleList$|RuleListFiltered|SocketGet|SocketDiagTCPInfo|SocketDiagTCP|SocketDiagUDPInfo|SocketDiagUDP|UnixSocketDiagInfo|UnixSocketDiag|VDPAGetDevConfigList|VDPAGetDevList|VDPAGetMGMTDevList|XfrmPolicyList|XfrmStateList)
           msg: Use internal nlwrap package for EINTR handling.
@@ -330,7 +330,7 @@ linters:
         linters:
           - forbidigo
       - text: 'use of `regexp.MustCompile` forbidden'
-        path: "internal/lazyregexp"
+        path: "daemon/internal/lazyregexp"
         linters:
           - forbidigo
       - text: 'use of `regexp.MustCompile` forbidden'

daemon/builder/backend/backend.go

@@ -9,7 +9,7 @@ import (
 	"github.com/docker/docker/daemon/builder"
 	daemonevents "github.com/docker/docker/daemon/events"
 	buildkit "github.com/docker/docker/daemon/internal/builder-next"
-	"github.com/docker/docker/image"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/build"

daemon/builder/backend/tag.go

@@ -6,7 +6,7 @@ import (
 	"io"
 
 	"github.com/distribution/reference"
-	"github.com/docker/docker/image"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/pkg/errors"
 )
 

daemon/builder/builder.go

@@ -8,8 +8,8 @@ import (
 	"context"
 	"io"
 
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/container"
 	"github.com/opencontainers/go-digest"

daemon/builder/dockerfile/dispatchers.go

@@ -17,8 +17,8 @@ import (
 
 	"github.com/containerd/platforms"
 	"github.com/docker/docker/daemon/builder"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/jsonmessage"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"

daemon/builder/dockerfile/dispatchers_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/oci"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/pkg/oci"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/buildkit/frontend/dockerfile/parser"

daemon/builder/dockerfile/dispatchers_windows.go

@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/docker/internal/lazyregexp"
+	"github.com/docker/docker/daemon/internal/lazyregexp"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/moby/api/types/container"
 )

daemon/builder/dockerfile/evaluator.go

@@ -26,9 +26,9 @@ import (
 	"strings"
 
 	"github.com/docker/docker/daemon/builder"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/pkg/oci"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/oci"
 	"github.com/moby/buildkit/frontend/dockerfile/instructions"
 	"github.com/moby/buildkit/frontend/dockerfile/shell"
 	"github.com/moby/moby/api/types/container"

daemon/builder/dockerfile/imagecontext.go

@@ -7,7 +7,7 @@ import (
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
 	"github.com/docker/docker/daemon/builder"
-	dockerimage "github.com/docker/docker/image"
+	dockerimage "github.com/docker/docker/daemon/internal/image"
 	"github.com/moby/moby/api/types/backend"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"

daemon/builder/dockerfile/imagecontext_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/containerd/platforms"
 	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/image"
+	"github.com/docker/docker/daemon/internal/image"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"gotest.tools/v3/assert"
 )

daemon/builder/dockerfile/internals.go

@@ -13,8 +13,8 @@ import (
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
 	"github.com/docker/docker/daemon/builder"
+	"github.com/docker/docker/daemon/internal/image"
 	networkSettings "github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/go-archive"

daemon/builder/dockerfile/internals_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/docker/docker/daemon/builder"
 	"github.com/docker/docker/daemon/builder/remotecontext"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/go-archive"
 	"github.com/moby/moby/api/types/backend"

daemon/builder/dockerfile/mockbackend_test.go

@@ -7,8 +7,8 @@ import (
 	"runtime"
 
 	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/container"
 	"github.com/opencontainers/go-digest"

daemon/builder/remotecontext/archive.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 
 	"github.com/docker/docker/daemon/builder"
+	"github.com/docker/docker/daemon/builder/remotecontext/internal/tarsum"
 	"github.com/docker/docker/pkg/longpath"
 	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/pkg/tarsum"
 	"github.com/moby/go-archive/chrootarchive"
 	"github.com/moby/go-archive/compression"
 	"github.com/moby/sys/symlink"

daemon/builder/remotecontext/filehash.go

@@ -6,7 +6,7 @@ import (
 	"hash"
 	"os"
 
-	"github.com/docker/docker/pkg/tarsum"
+	"github.com/docker/docker/daemon/builder/remotecontext/internal/tarsum"
 	"github.com/moby/go-archive"
 )
 

daemon/builder/remotecontext/remote.go

@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"net/url"
 
+	"github.com/docker/docker/daemon/internal/lazyregexp"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/internal/lazyregexp"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/pkg/errors"
 )

daemon/builder/remotecontext/urlutil/urlutil.go

@@ -8,7 +8,7 @@ package urlutil
 import (
 	"strings"
 
-	"github.com/docker/docker/internal/lazyregexp"
+	"github.com/docker/docker/daemon/internal/lazyregexp"
 )
 
 // urlPathWithFragmentSuffix matches fragments to use as Git reference and build

daemon/cluster/executor/backend.go

@@ -8,13 +8,13 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/distribution"
 	clustertypes "github.com/docker/docker/daemon/cluster/provider"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/docker/docker/daemon/libnetwork/cluster"
 	networktypes "github.com/docker/docker/daemon/libnetwork/types"
 	networkSettings "github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/plugin"
 	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
-	"github.com/docker/docker/image"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"

daemon/cluster/listen_addr_linux.go

@@ -3,7 +3,7 @@ package cluster
 import (
 	"net"
 
-	"github.com/docker/docker/internal/nlwrap"
+	"github.com/docker/docker/daemon/libnetwork/nlwrap"
 	"github.com/vishvananda/netlink"
 )
 

daemon/command/config.go

@@ -4,9 +4,9 @@ import (
 	"runtime"
 
 	"github.com/docker/docker/daemon/config"
+	dopts "github.com/docker/docker/daemon/internal/opts"
 	"github.com/docker/docker/daemon/pkg/opts"
-	dopts "github.com/docker/docker/internal/opts"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/spf13/pflag"
 )
 

daemon/command/daemon.go

@@ -28,6 +28,7 @@ import (
 	buildkit "github.com/docker/docker/daemon/internal/builder-next"
 	"github.com/docker/docker/daemon/internal/builder-next/exporter"
 	"github.com/docker/docker/daemon/internal/libcontainerd/supervisor"
+	"github.com/docker/docker/daemon/internal/otelutil"
 	"github.com/docker/docker/daemon/listeners"
 	dopts "github.com/docker/docker/daemon/pkg/opts"
 	"github.com/docker/docker/daemon/pkg/plugin"
@@ -48,7 +49,6 @@ import (
 	systemrouter "github.com/docker/docker/daemon/server/router/system"
 	"github.com/docker/docker/daemon/server/router/volume"
 	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/internal/otelutil"
 	"github.com/docker/docker/pkg/authorization"
 	"github.com/docker/docker/pkg/homedir"
 	"github.com/docker/docker/pkg/pidfile"

daemon/config/config.go

@@ -13,9 +13,9 @@ import (
 
 	"dario.cat/mergo"
 	"github.com/containerd/log"
+	dopts "github.com/docker/docker/daemon/internal/opts"
 	"github.com/docker/docker/daemon/pkg/opts"
-	dopts "github.com/docker/docker/internal/opts"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/moby/moby/api"
 	"github.com/moby/moby/api/types/versions"
 	"github.com/pkg/errors"

daemon/config/config_linux_test.go

@@ -4,8 +4,8 @@ import (
 	"net/netip"
 	"testing"
 
+	dopts "github.com/docker/docker/daemon/internal/opts"
 	"github.com/docker/docker/daemon/pkg/opts"
-	dopts "github.com/docker/docker/internal/opts"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/moby/moby/api/types/container"
 	"github.com/spf13/pflag"

daemon/config/config_test.go

@@ -13,7 +13,7 @@ import (
 	"dario.cat/mergo"
 	"github.com/docker/docker/daemon/libnetwork/ipamutils"
 	"github.com/docker/docker/daemon/pkg/opts"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/spf13/pflag"

daemon/container.go

@@ -17,12 +17,12 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/network"
+	"github.com/docker/docker/daemon/pkg/oci/caps"
 	"github.com/docker/docker/daemon/pkg/opts"
 	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/oci/caps"
 	"github.com/docker/go-connections/nat"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/mount"

daemon/container/container.go

@@ -17,6 +17,7 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
+	"github.com/docker/docker/daemon/internal/image"
 	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"
 	"github.com/docker/docker/daemon/internal/restartmanager"
 	"github.com/docker/docker/daemon/internal/stream"
@@ -25,11 +26,10 @@ import (
 	"github.com/docker/docker/daemon/logger/local"
 	"github.com/docker/docker/daemon/logger/loggerutils/cache"
 	"github.com/docker/docker/daemon/network"
+	"github.com/docker/docker/daemon/pkg/oci"
 	"github.com/docker/docker/daemon/volume"
 	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/oci"
 	"github.com/docker/go-units"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"

daemon/container_operations.go

@@ -18,6 +18,8 @@ import (
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/internal/metrics"
+	"github.com/docker/docker/daemon/internal/multierror"
+	"github.com/docker/docker/daemon/internal/sliceutil"
 	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/docker/docker/daemon/libnetwork/netlabel"
 	"github.com/docker/docker/daemon/libnetwork/scope"
@@ -25,8 +27,6 @@ import (
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/opts"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/internal/multierror"
-	"github.com/docker/docker/internal/sliceutil"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/docker/runconfig"
 	"github.com/docker/go-connections/nat"

daemon/containerd/cache.go

@@ -10,11 +10,11 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/builder"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/image/cache"
+	"github.com/docker/docker/daemon/internal/layer"
+	"github.com/docker/docker/daemon/internal/multierror"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/image/cache"
-	"github.com/docker/docker/internal/multierror"
-	"github.com/docker/docker/layer"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/container"
 	"github.com/opencontainers/go-digest"

daemon/containerd/image.go

@@ -13,8 +13,8 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/images"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
 	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/opencontainers/go-digest"

daemon/containerd/image_builder.go

@@ -22,9 +22,9 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/builder"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/stringid"

daemon/containerd/image_children.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	c8dimages "github.com/containerd/containerd/v2/core/images"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 )

daemon/containerd/image_commit.go

@@ -16,7 +16,7 @@ import (
 	"github.com/containerd/containerd/v2/core/snapshots"
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
-	"github.com/docker/docker/image"
+	"github.com/docker/docker/daemon/internal/image"
 	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/moby/go-archive"
 	"github.com/moby/moby/api/types/backend"

daemon/containerd/image_delete.go

@@ -16,8 +16,8 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/container"
 	dimages "github.com/docker/docker/daemon/images"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/metrics"
-	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/moby/moby/api/types/events"
 	imagetypes "github.com/moby/moby/api/types/image"

daemon/containerd/image_import.go

@@ -16,8 +16,8 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/builder/dockerfile"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/pools"
 	"github.com/google/uuid"
 	imagespec "github.com/moby/docker-image-spec/specs-go/v1"

daemon/containerd/image_inspect.go

@@ -13,7 +13,7 @@ import (
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
-	"github.com/docker/docker/internal/sliceutil"
+	"github.com/docker/docker/daemon/internal/sliceutil"
 	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/moby/moby/api/types/backend"
 	imagetypes "github.com/moby/moby/api/types/image"

daemon/containerd/image_pull.go

@@ -16,8 +16,8 @@ import (
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
+	"github.com/docker/docker/daemon/internal/distribution"
 	"github.com/docker/docker/daemon/internal/metrics"
-	"github.com/docker/docker/distribution"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"

daemon/containerd/image_snapshot.go

@@ -12,10 +12,10 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/daemon/snapshotter"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/opencontainers/image-spec/identity"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"

daemon/containerd/image_tag.go

@@ -8,8 +8,8 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
 	"github.com/moby/moby/api/types/events"
 	"github.com/pkg/errors"
 )

daemon/containerd/imagespec.go

@@ -6,8 +6,8 @@ package containerd
 import (
 	"slices"
 
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/image"
 	"github.com/docker/go-connections/nat"
 	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/moby/moby/api/types/container"

daemon/containerd/resolver.go

@@ -10,9 +10,9 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/pkg/useragent"
-	"github.com/docker/docker/registry"
 	registrytypes "github.com/moby/moby/api/types/registry"
 )
 

daemon/containerd/service.go

@@ -17,8 +17,8 @@ import (
 	"github.com/docker/docker/daemon/container"
 	daemonevents "github.com/docker/docker/daemon/events"
 	dimages "github.com/docker/docker/daemon/images"
+	"github.com/docker/docker/daemon/internal/distribution"
 	"github.com/docker/docker/daemon/snapshotter"
-	"github.com/docker/docker/distribution"
 	"github.com/docker/docker/errdefs"
 	"github.com/moby/sys/user"
 	"github.com/opencontainers/go-digest"

daemon/containerd/service_unix.go

@@ -4,8 +4,8 @@ package containerd
 
 import (
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
 	"github.com/pkg/errors"
 )
 

daemon/containerd/service_windows.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/image"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/pkg/errors"
 )
 

daemon/containerfs_linux.go

@@ -17,7 +17,7 @@ import (
 
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/internal/mounttree"
-	"github.com/docker/docker/internal/unshare"
+	"github.com/docker/docker/daemon/internal/unshare"
 	"github.com/docker/docker/pkg/fileutils"
 	containertypes "github.com/moby/moby/api/types/container"
 )

daemon/create.go

@@ -17,11 +17,11 @@ import (
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/images"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/metrics"
+	"github.com/docker/docker/daemon/internal/multierror"
+	"github.com/docker/docker/daemon/internal/otelutil"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/internal/multierror"
-	"github.com/docker/docker/internal/otelutil"
 	"github.com/docker/docker/runconfig"
 	"github.com/moby/moby/api/types/backend"
 	containertypes "github.com/moby/moby/api/types/container"

daemon/create_unix.go

@@ -11,10 +11,10 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/internal/idtools"
+	"github.com/docker/docker/daemon/pkg/oci"
 	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
-	"github.com/docker/docker/oci"
-	"github.com/docker/docker/pkg/idtools"
 	containertypes "github.com/moby/moby/api/types/container"
 	mounttypes "github.com/moby/moby/api/types/mount"
 	"github.com/opencontainers/selinux/go-selinux/label"

daemon/daemon.go

@@ -39,9 +39,15 @@ import (
 	"github.com/docker/docker/daemon/events"
 	_ "github.com/docker/docker/daemon/graphdriver/register" // register graph drivers
 	"github.com/docker/docker/daemon/images"
+	"github.com/docker/docker/daemon/internal/distribution"
+	dmetadata "github.com/docker/docker/daemon/internal/distribution/metadata"
+	"github.com/docker/docker/daemon/internal/idtools"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	libcontainerdtypes "github.com/docker/docker/daemon/internal/libcontainerd/types"
 	"github.com/docker/docker/daemon/internal/metrics"
 	pluginexec "github.com/docker/docker/daemon/internal/plugin/executor/containerd"
+	refstore "github.com/docker/docker/daemon/internal/refstore"
 	"github.com/docker/docker/daemon/libnetwork"
 	"github.com/docker/docker/daemon/libnetwork/cluster"
 	nwconfig "github.com/docker/docker/daemon/libnetwork/config"
@@ -50,21 +56,15 @@ import (
 	dlogger "github.com/docker/docker/daemon/logger"
 	"github.com/docker/docker/daemon/network"
 	"github.com/docker/docker/daemon/pkg/plugin"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/daemon/snapshotter"
 	"github.com/docker/docker/daemon/stats"
 	volumesservice "github.com/docker/docker/daemon/volume/service"
-	"github.com/docker/docker/distribution"
-	dmetadata "github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/authorization"
 	"github.com/docker/docker/pkg/fileutils"
-	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/docker/pkg/plugingetter"
 	"github.com/docker/docker/pkg/sysinfo"
-	refstore "github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
 	"github.com/moby/buildkit/util/grpcerrors"
 	"github.com/moby/buildkit/util/tracing"
 	"github.com/moby/locker"

daemon/daemon_test.go

@@ -9,9 +9,9 @@ import (
 
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/internal/idtools"
 	"github.com/docker/docker/daemon/libnetwork"
 	volumesservice "github.com/docker/docker/daemon/volume/service"
-	"github.com/docker/docker/pkg/idtools"
 	"github.com/docker/go-connections/nat"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/pkg/errors"

daemon/daemon_unix.go

@@ -27,18 +27,18 @@ import (
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/initlayer"
 	"github.com/docker/docker/daemon/internal/libcontainerd/remote"
+	"github.com/docker/docker/daemon/internal/otelutil"
 	"github.com/docker/docker/daemon/internal/usergroup"
 	"github.com/docker/docker/daemon/libnetwork"
 	nwconfig "github.com/docker/docker/daemon/libnetwork/config"
 	"github.com/docker/docker/daemon/libnetwork/drivers/bridge"
 	"github.com/docker/docker/daemon/libnetwork/netlabel"
+	"github.com/docker/docker/daemon/libnetwork/nlwrap"
 	"github.com/docker/docker/daemon/libnetwork/options"
 	lntypes "github.com/docker/docker/daemon/libnetwork/types"
 	"github.com/docker/docker/daemon/pkg/opts"
 	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/internal/nlwrap"
-	"github.com/docker/docker/internal/otelutil"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/docker/docker/runconfig"
 	"github.com/moby/moby/api/types/blkiodev"

daemon/delete.go

@@ -11,9 +11,9 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/internal/containerfs"
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/internal/containerfs"
 	"github.com/moby/moby/api/types/backend"
 	containertypes "github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"

daemon/events/testutils/testutils.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/internal/lazyregexp"
+	"github.com/docker/docker/daemon/internal/lazyregexp"
 	"github.com/moby/moby/api/types/events"
 	timetypes "github.com/moby/moby/api/types/time"
 )

daemon/exec_linux.go

@@ -8,7 +8,7 @@ import (
 	coci "github.com/containerd/containerd/v2/pkg/oci"
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/oci/caps"
+	"github.com/docker/docker/daemon/pkg/oci/caps"
 	"github.com/opencontainers/runtime-spec/specs-go"
 )
 

daemon/graphdriver/btrfs/btrfs.go

@@ -36,8 +36,8 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/graphdriver"
+	"github.com/docker/docker/daemon/internal/containerfs"
 	"github.com/docker/docker/daemon/internal/fstype"
-	"github.com/docker/docker/internal/containerfs"
 	"github.com/docker/go-units"
 	"github.com/moby/sys/mount"
 	"github.com/moby/sys/user"

daemon/graphdriver/fuse-overlayfs/fuseoverlayfs.go

@@ -15,10 +15,10 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/graphdriver"
 	"github.com/docker/docker/daemon/graphdriver/overlayutils"
+	"github.com/docker/docker/daemon/internal/containerfs"
 	"github.com/docker/docker/daemon/internal/directory"
 	"github.com/docker/docker/daemon/internal/fstype"
 	"github.com/docker/docker/daemon/internal/mountref"
-	"github.com/docker/docker/internal/containerfs"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/moby/go-archive"
 	"github.com/moby/go-archive/chrootarchive"

daemon/graphdriver/overlay2/overlay.go

@@ -18,11 +18,11 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/graphdriver"
 	"github.com/docker/docker/daemon/graphdriver/overlayutils"
+	"github.com/docker/docker/daemon/internal/containerfs"
 	"github.com/docker/docker/daemon/internal/directory"
 	"github.com/docker/docker/daemon/internal/fstype"
 	"github.com/docker/docker/daemon/internal/mountref"
 	"github.com/docker/docker/daemon/internal/quota"
-	"github.com/docker/docker/internal/containerfs"
 	"github.com/docker/go-units"
 	"github.com/moby/go-archive"
 	"github.com/moby/go-archive/chrootarchive"

daemon/graphdriver/vfs/driver.go

@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 
 	"github.com/docker/docker/daemon/graphdriver"
+	"github.com/docker/docker/daemon/internal/containerfs"
 	"github.com/docker/docker/daemon/internal/quota"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/internal/containerfs"
 	"github.com/docker/go-units"
 	"github.com/moby/sys/user"
 	"github.com/opencontainers/selinux/go-selinux/label"

daemon/hosts.go

@@ -16,7 +16,7 @@ import (
 	"github.com/containerd/containerd/v2/core/remotes/docker"
 	hostconfig "github.com/containerd/containerd/v2/core/remotes/docker/config"
 	cerrdefs "github.com/containerd/errdefs"
-	"github.com/docker/docker/registry"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/pkg/errors"
 )
 

daemon/image_service.go

@@ -8,8 +8,8 @@ import (
 	"github.com/docker/docker/daemon/builder"
 	"github.com/docker/docker/daemon/container"
 	"github.com/docker/docker/daemon/images"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/moby/go-archive"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/events"

daemon/images/cache.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/image/cache"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/image/cache"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/moby/moby/api/types/backend"
 )
 

daemon/images/image.go

@@ -13,8 +13,8 @@ import (
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/images/image_builder.go

@@ -10,8 +10,8 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/builder"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/stringid"

daemon/images/image_changes.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/moby/go-archive"
 )
 

daemon/images/image_commit.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"io"
 
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/events"

daemon/images/image_delete.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/docker/docker/daemon/internal/metrics"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/events"

daemon/images/image_exporter.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"io"
 
+	"github.com/docker/docker/daemon/internal/image/tarexport"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image/tarexport"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 )

daemon/images/image_history.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/distribution/reference"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/daemon/internal/metrics"
-	"github.com/docker/docker/layer"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/image"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/images/image_import.go

@@ -9,10 +9,10 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/builder/dockerfile"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/moby/go-archive/compression"
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/events"

daemon/images/image_inspect.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/distribution/reference"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/moby/moby/api/types/backend"
 	imagetypes "github.com/moby/moby/api/types/image"
 	"github.com/moby/moby/api/types/storage"

daemon/images/image_list.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/distribution/reference"
 	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/moby/moby/api/types/backend"
 	imagetypes "github.com/moby/moby/api/types/image"
 	timetypes "github.com/moby/moby/api/types/time"

daemon/images/image_prune.go

@@ -8,9 +8,9 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/moby/moby/api/types/events"
 	"github.com/moby/moby/api/types/filters"
 	imagetypes "github.com/moby/moby/api/types/image"

daemon/images/image_pull.go

@@ -10,9 +10,9 @@ import (
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
+	"github.com/docker/docker/daemon/internal/distribution"
+	progressutils "github.com/docker/docker/daemon/internal/distribution/utils"
 	"github.com/docker/docker/daemon/internal/metrics"
-	"github.com/docker/docker/distribution"
-	progressutils "github.com/docker/docker/distribution/utils"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/moby/moby/api/types/backend"

daemon/images/image_push.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/distribution/reference"
 	"github.com/docker/distribution/manifest/schema2"
+	"github.com/docker/docker/daemon/internal/distribution"
+	progressutils "github.com/docker/docker/daemon/internal/distribution/utils"
 	"github.com/docker/docker/daemon/internal/metrics"
-	"github.com/docker/docker/distribution"
-	progressutils "github.com/docker/docker/distribution/utils"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/registry"

daemon/images/image_squash.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/pkg/errors"
 )
 

daemon/images/image_tag.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/distribution/reference"
-	"github.com/docker/docker/image"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/moby/moby/api/types/events"
 )
 

daemon/images/image_unix.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/image"
+	"github.com/docker/docker/daemon/internal/image"
 )
 
 // GetLayerFolders returns the layer folders from an image RootFS

daemon/images/image_windows.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/docker/docker/daemon/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/pkg/errors"
 )
 

daemon/images/service.go

@@ -11,12 +11,12 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/container"
 	daemonevents "github.com/docker/docker/daemon/events"
-	"github.com/docker/docker/distribution"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	refstore "github.com/docker/docker/reference"
+	"github.com/docker/docker/daemon/internal/distribution"
+	"github.com/docker/docker/daemon/internal/distribution/metadata"
+	"github.com/docker/docker/daemon/internal/distribution/xfer"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
+	refstore "github.com/docker/docker/daemon/internal/refstore"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 )

daemon/images/store.go

@@ -9,9 +9,9 @@ import (
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/containerd/log"
-	"github.com/docker/docker/distribution"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/distribution"
+	"github.com/docker/docker/daemon/internal/image"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 )

daemon/images/store_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/containerd/containerd/v2/pkg/namespaces"
 	"github.com/containerd/containerd/v2/plugins/content/local"
 	cerrdefs "github.com/containerd/errdefs"
-	"github.com/docker/docker/image"
+	"github.com/docker/docker/daemon/internal/image"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	bolt "go.etcd.io/bbolt"

daemon/info.go

@@ -18,14 +18,14 @@ import (
 	"github.com/docker/docker/daemon/config"
 	"github.com/docker/docker/daemon/internal/filedescriptors"
 	"github.com/docker/docker/daemon/internal/metrics"
+	"github.com/docker/docker/daemon/internal/platform"
 	"github.com/docker/docker/daemon/logger"
+	"github.com/docker/docker/daemon/pkg/registry"
 	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/internal/platform"
 	"github.com/docker/docker/pkg/meminfo"
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/parsers/operatingsystem"
 	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/registry"
 	"github.com/moby/moby/api/types"
 	"github.com/moby/moby/api/types/system"
 	"github.com/opencontainers/selinux/go-selinux"