Move layer to daemon/internal/layer

Signed-off-by: Derek McGowan <derek@mcg.dev>

daemon/builder/builder.go

@@ -8,8 +8,8 @@ import (
 	"context"
 	"io"
 
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"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/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/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/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/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"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/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/layer"
 	"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_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/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_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/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/daemon.go

@@ -39,6 +39,7 @@ 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/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"
@@ -57,7 +58,6 @@ import (
 	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"

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/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/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/daemon/internal/layer"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/image/cache"
-	"github.com/docker/docker/layer"
 	"github.com/moby/moby/api/types/backend"
 )
 

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/daemon/internal/layer"
 	"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/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/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/moby/moby/api/types/backend"
 	"github.com/moby/moby/api/types/events"

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/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/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/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/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/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/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_squash.go

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

daemon/images/image_windows.go

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

daemon/images/service.go

@@ -11,11 +11,11 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/container"
 	daemonevents "github.com/docker/docker/daemon/events"
+	"github.com/docker/docker/daemon/internal/layer"
 	"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/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/daemon/internal/layer"
 	"github.com/docker/docker/distribution"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
 )

daemon/internal/builder-next/adapters/containerimage/pull.go

@@ -26,10 +26,10 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
 	dimages "github.com/docker/docker/daemon/images"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/distribution/xfer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	pkgprogress "github.com/docker/docker/pkg/progress"
 	refstore "github.com/docker/docker/reference"
 	"github.com/moby/buildkit/cache"

daemon/internal/builder-next/adapters/snapshot/layer.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/pkg/longpath"
 	"github.com/opencontainers/image-spec/identity"
 	"github.com/pkg/errors"

daemon/internal/builder-next/adapters/snapshot/snapshot.go

@@ -12,7 +12,7 @@ import (
 	"github.com/containerd/containerd/v2/core/snapshots"
 	cerrdefs "github.com/containerd/errdefs"
 	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/moby/buildkit/identity"
 	"github.com/moby/buildkit/snapshot"
 	"github.com/moby/buildkit/util/leaseutil"

daemon/internal/builder-next/exporter/mobyexporter/export.go

@@ -14,8 +14,8 @@ import (
 	"github.com/containerd/containerd/v2/core/leases"
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/moby/buildkit/exporter"
 	"github.com/moby/buildkit/exporter/containerimage"
 	"github.com/moby/buildkit/exporter/containerimage/exptypes"

daemon/internal/builder-next/imagerefchecker/checker.go

@@ -3,8 +3,8 @@ package imagerefchecker
 import (
 	"sync"
 
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/moby/buildkit/cache"
 	"github.com/opencontainers/go-digest"
 )

daemon/internal/builder-next/worker/worker.go

@@ -17,9 +17,9 @@ import (
 	imageadapter "github.com/docker/docker/daemon/internal/builder-next/adapters/containerimage"
 	mobyexporter "github.com/docker/docker/daemon/internal/builder-next/exporter"
 	"github.com/docker/docker/daemon/internal/builder-next/worker/mod"
+	"github.com/docker/docker/daemon/internal/layer"
 	distmetadata "github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/layer"
 	pkgprogress "github.com/docker/docker/pkg/progress"
 	"github.com/moby/buildkit/cache"
 	cacheconfig "github.com/moby/buildkit/cache/config"

daemon/volumes.go

@@ -11,12 +11,12 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/container"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/daemon/volume"
 	volumemounts "github.com/docker/docker/daemon/volume/mounts"
 	"github.com/docker/docker/daemon/volume/service"
 	volumeopts "github.com/docker/docker/daemon/volume/service/opts"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/layer"
 	"github.com/moby/moby/api/types/backend"
 	containertypes "github.com/moby/moby/api/types/container"
 	mounttypes "github.com/moby/moby/api/types/mount"

distribution/config.go

@@ -9,10 +9,10 @@ import (
 	"github.com/distribution/reference"
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/manifest/schema2"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/distribution/xfer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/progress"
 	refstore "github.com/docker/docker/reference"
 	registrypkg "github.com/docker/docker/registry"

distribution/metadata/v2_metadata_service.go

@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/moby/moby/api/types/registry"
 	"github.com/opencontainers/go-digest"
 )

distribution/metadata/v2_metadata_service_test.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/opencontainers/go-digest"
 )
 

distribution/pull_v2.go

@@ -17,10 +17,10 @@ import (
 	"github.com/docker/distribution/manifest/ocischema"
 	"github.com/docker/distribution/manifest/schema2"
 	"github.com/docker/distribution/registry/client/transport"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/distribution/xfer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/stringid"

distribution/push_v2.go

@@ -14,9 +14,9 @@ import (
 	"github.com/docker/distribution/manifest/schema2"
 	"github.com/docker/distribution/registry/api/errcode"
 	"github.com/docker/distribution/registry/client"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/distribution/metadata"
 	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/stringid"

distribution/push_v2_test.go

@@ -10,8 +10,8 @@ import (
 	"github.com/docker/distribution"
 	"github.com/docker/distribution/manifest/schema2"
 	"github.com/docker/distribution/registry/api/errcode"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/progress"
 	refstore "github.com/docker/docker/reference"
 	registrypkg "github.com/docker/docker/registry"

distribution/xfer/download.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/distribution"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/ioutils"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/moby/go-archive/compression"

distribution/xfer/download_test.go

@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"github.com/docker/distribution"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/identity"

distribution/xfer/upload.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/distribution"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/pkg/progress"
 )
 

distribution/xfer/upload_test.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/docker/distribution"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/pkg/progress"
 )
 

image/cache/cache.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/containerd/log"
 	"github.com/docker/docker/daemon/builder"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	containertypes "github.com/moby/moby/api/types/container"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"

image/image.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/layer"
 	"github.com/moby/moby/api/types/container"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

image/image_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/google/go-cmp/cmp"
 	"github.com/moby/moby/api/types/container"
 	"gotest.tools/v3/assert"

image/rootfs.go

@@ -6,7 +6,7 @@ package image
 import (
 	"slices"
 
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/opencontainers/image-spec/identity"
 )
 

image/store.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/containerd/log"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/errdefs"
-	"github.com/docker/docker/layer"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/go-digest/digestset"
 	"github.com/pkg/errors"

image/store_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	cerrdefs "github.com/containerd/errdefs"
-	"github.com/docker/docker/layer"
+	"github.com/docker/docker/daemon/internal/layer"
 	"gotest.tools/v3/assert"
 	is "gotest.tools/v3/assert/cmp"
 )

image/tarexport/load.go

@@ -15,9 +15,9 @@ import (
 	"github.com/containerd/log"
 	"github.com/distribution/reference"
 	"github.com/docker/distribution"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/image"
 	"github.com/docker/docker/internal/ioutils"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/stringid"

image/tarexport/save.go

@@ -16,10 +16,10 @@ import (
 	"github.com/containerd/platforms"
 	"github.com/distribution/reference"
 	"github.com/docker/distribution"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/image"
 	v1 "github.com/docker/docker/image/v1"
 	"github.com/docker/docker/internal/ioutils"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/system"
 	"github.com/moby/go-archive"
 	"github.com/moby/moby/api/types/events"

image/tarexport/tarexport.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/containerd/platforms"
 	"github.com/docker/distribution"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	refstore "github.com/docker/docker/reference"
 	"github.com/moby/moby/api/types/events"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

image/v1/imagev1.go

@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 
 	"github.com/containerd/log"
+	"github.com/docker/docker/daemon/internal/layer"
 	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/opencontainers/go-digest"
 )