diff --git a/client/client.go b/client/client.go index ff1440d0d..e47531ee4 100644 --- a/client/client.go +++ b/client/client.go @@ -42,10 +42,10 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" contentproxy "github.com/containerd/containerd/v2/core/content/proxy" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" leasesproxy "github.com/containerd/containerd/v2/leases/proxy" "github.com/containerd/containerd/v2/namespaces" diff --git a/client/client_opts.go b/client/client_opts.go index ffc49a43c..76ed645cf 100644 --- a/client/client_opts.go +++ b/client/client_opts.go @@ -19,7 +19,7 @@ package client import ( "time" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/snapshots" diff --git a/client/container.go b/client/container.go index 3d7748d07..8d7b270ec 100644 --- a/client/container.go +++ b/client/container.go @@ -29,8 +29,8 @@ import ( tasktypes "github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/runtime/v2/runc/options" diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index 19c0dd944..27056cd8d 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -26,7 +26,7 @@ import ( tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/diff" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" diff --git a/client/container_opts.go b/client/container_opts.go index ae89a527f..f18c5c7dc 100644 --- a/client/container_opts.go +++ b/client/container_opts.go @@ -24,8 +24,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/protobuf" diff --git a/client/container_restore_opts.go b/client/container_restore_opts.go index fe9e2873c..aef066414 100644 --- a/client/container_restore_opts.go +++ b/client/container_restore_opts.go @@ -23,7 +23,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/protobuf/proto" ptypes "github.com/containerd/containerd/v2/protobuf/types" "github.com/opencontainers/image-spec/identity" diff --git a/client/export.go b/client/export.go index b68594698..bd34c65d4 100644 --- a/client/export.go +++ b/client/export.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" ) // Export exports images to a Tar stream. diff --git a/client/image.go b/client/image.go index 36ad51fad..f3b9f728d 100644 --- a/client/image.go +++ b/client/image.go @@ -25,9 +25,9 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/usage" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/usage" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/platforms" diff --git a/client/image_store.go b/client/image_store.go index 53e71ce57..6a9af056a 100644 --- a/client/image_store.go +++ b/client/image_store.go @@ -20,8 +20,8 @@ import ( "context" imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/protobuf" diff --git a/client/import.go b/client/import.go index d852f3712..2bc1e4938 100644 --- a/client/import.go +++ b/client/import.go @@ -20,9 +20,9 @@ import ( "context" "io" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/platforms" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/install.go b/client/install.go index 37b0119ea..bb746afd8 100644 --- a/client/install.go +++ b/client/install.go @@ -29,7 +29,7 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" ) // Install a binary image into the opt service. diff --git a/client/pull.go b/client/pull.go index f8b42947a..4761d74e4 100644 --- a/client/pull.go +++ b/client/pull.go @@ -24,8 +24,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "golang.org/x/sync/semaphore" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/remotes" diff --git a/client/services.go b/client/services.go index fbc217862..b6922b2ab 100644 --- a/client/services.go +++ b/client/services.go @@ -27,7 +27,7 @@ import ( "github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins" diff --git a/client/signals.go b/client/signals.go index ed1b56311..9a7d91b80 100644 --- a/client/signals.go +++ b/client/signals.go @@ -23,7 +23,7 @@ import ( "syscall" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/moby/sys/signal" v1 "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/client/task.go b/client/task.go index ef9488adc..dd4ba6d98 100644 --- a/client/task.go +++ b/client/task.go @@ -31,8 +31,8 @@ import ( "github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/plugins" diff --git a/client/task_opts.go b/client/task_opts.go index 85e555a62..5c5616d87 100644 --- a/client/task_opts.go +++ b/client/task_opts.go @@ -23,8 +23,8 @@ import ( "syscall" "github.com/containerd/containerd/v2/api/types" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/runtime-spec/specs-go" diff --git a/cmd/containerd/command/config.go b/cmd/containerd/command/config.go index 9bd72c60c..4bd14bb30 100644 --- a/cmd/containerd/command/config.go +++ b/cmd/containerd/command/config.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/services/server" srvconfig "github.com/containerd/containerd/v2/services/server/config" diff --git a/cmd/ctr/commands/content/fetch.go b/cmd/ctr/commands/content/fetch.go index 17deb21b6..6b34e730a 100644 --- a/cmd/ctr/commands/content/fetch.go +++ b/cmd/ctr/commands/content/fetch.go @@ -29,8 +29,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/remotes" diff --git a/cmd/ctr/commands/images/convert.go b/cmd/ctr/commands/images/convert.go index 071a1d065..5e91e0dfe 100644 --- a/cmd/ctr/commands/images/convert.go +++ b/cmd/ctr/commands/images/convert.go @@ -21,8 +21,8 @@ import ( "fmt" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/images/converter" - "github.com/containerd/containerd/v2/images/converter/uncompress" + "github.com/containerd/containerd/v2/core/images/converter" + "github.com/containerd/containerd/v2/core/images/converter/uncompress" "github.com/containerd/containerd/v2/platforms" "github.com/urfave/cli" ) diff --git a/cmd/ctr/commands/images/export.go b/cmd/ctr/commands/images/export.go index 95031e54e..b19604676 100644 --- a/cmd/ctr/commands/images/export.go +++ b/cmd/ctr/commands/images/export.go @@ -25,7 +25,7 @@ import ( "github.com/urfave/cli" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/cmd/ctr/commands/images/images.go b/cmd/ctr/commands/images/images.go index 21787d21a..929addfce 100644 --- a/cmd/ctr/commands/images/images.go +++ b/cmd/ctr/commands/images/images.go @@ -25,8 +25,8 @@ import ( "text/tabwriter" "github.com/containerd/containerd/v2/cmd/ctr/commands" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/cmd/ctr/commands/images/import.go b/cmd/ctr/commands/images/import.go index bb663904a..75bf4b3ca 100644 --- a/cmd/ctr/commands/images/import.go +++ b/cmd/ctr/commands/images/import.go @@ -27,7 +27,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/transfer" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/cmd/ctr/commands/images/pull.go b/cmd/ctr/commands/images/pull.go index fa94d9f43..4a6c12229 100644 --- a/cmd/ctr/commands/images/pull.go +++ b/cmd/ctr/commands/images/pull.go @@ -27,7 +27,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/cmd/ctr/commands/images/push.go b/cmd/ctr/commands/images/push.go index e00eb3e75..72f105a99 100644 --- a/cmd/ctr/commands/images/push.go +++ b/cmd/ctr/commands/images/push.go @@ -29,7 +29,7 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/image" diff --git a/contrib/fuzz/archive_fuzzer.go b/contrib/fuzz/archive_fuzzer.go index aa2fa6443..d68330e1b 100644 --- a/contrib/fuzz/archive_fuzzer.go +++ b/contrib/fuzz/archive_fuzzer.go @@ -26,7 +26,7 @@ import ( fuzz "github.com/AdaLogics/go-fuzz-headers" "github.com/containerd/containerd/v2/archive" - imageArchive "github.com/containerd/containerd/v2/images/archive" + imageArchive "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/fuzz/content_fuzzer.go b/contrib/fuzz/content_fuzzer.go index d3f014e79..de948c8a9 100644 --- a/contrib/fuzz/content_fuzzer.go +++ b/contrib/fuzz/content_fuzzer.go @@ -30,7 +30,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/plugins/content/local" ) diff --git a/contrib/fuzz/fuzz_images.go b/contrib/fuzz/fuzz_images.go index 006bdf0ad..1032266f9 100644 --- a/contrib/fuzz/fuzz_images.go +++ b/contrib/fuzz/fuzz_images.go @@ -20,7 +20,7 @@ import ( "os" fuzz "github.com/AdaLogics/go-fuzz-headers" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/plugins/content/local" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/contrib/fuzz/metadata_fuzzer.go b/contrib/fuzz/metadata_fuzzer.go index 7ed388c9a..fe770b4a0 100644 --- a/contrib/fuzz/metadata_fuzzer.go +++ b/contrib/fuzz/metadata_fuzzer.go @@ -28,7 +28,7 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/namespaces" diff --git a/core/diff/stream.go b/core/diff/stream.go index 940f82a6b..2265dfb2e 100644 --- a/core/diff/stream.go +++ b/core/diff/stream.go @@ -23,7 +23,7 @@ import ( "os" "github.com/containerd/containerd/v2/archive/compression" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/typeurl/v2" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/annotations.go b/core/images/annotations.go similarity index 100% rename from images/annotations.go rename to core/images/annotations.go diff --git a/images/archive/exporter.go b/core/images/archive/exporter.go similarity index 99% rename from images/archive/exporter.go rename to core/images/archive/exporter.go index 30acd9879..c25fe7c29 100644 --- a/images/archive/exporter.go +++ b/core/images/archive/exporter.go @@ -27,8 +27,8 @@ import ( "strings" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/images/archive/importer.go b/core/images/archive/importer.go similarity index 99% rename from images/archive/importer.go rename to core/images/archive/importer.go index 57cf81e13..2af4a4dbf 100644 --- a/images/archive/importer.go +++ b/core/images/archive/importer.go @@ -29,8 +29,8 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/images/archive/reference.go b/core/images/archive/reference.go similarity index 100% rename from images/archive/reference.go rename to core/images/archive/reference.go diff --git a/images/converter/converter.go b/core/images/converter/converter.go similarity index 98% rename from images/converter/converter.go rename to core/images/converter/converter.go index 2601bc9f9..ec46e5397 100644 --- a/images/converter/converter.go +++ b/core/images/converter/converter.go @@ -21,7 +21,7 @@ import ( "context" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/platforms" ) diff --git a/images/converter/default.go b/core/images/converter/default.go similarity index 99% rename from images/converter/default.go rename to core/images/converter/default.go index 7f4021d8e..538055d95 100644 --- a/images/converter/default.go +++ b/core/images/converter/default.go @@ -25,7 +25,7 @@ import ( "sync" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" "github.com/opencontainers/go-digest" diff --git a/images/converter/uncompress/uncompress.go b/core/images/converter/uncompress/uncompress.go similarity index 97% rename from images/converter/uncompress/uncompress.go rename to core/images/converter/uncompress/uncompress.go index b3162fe24..117e21186 100644 --- a/images/converter/uncompress/uncompress.go +++ b/core/images/converter/uncompress/uncompress.go @@ -23,9 +23,9 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/converter" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/converter" "github.com/containerd/containerd/v2/labels" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/images/diffid.go b/core/images/diffid.go similarity index 100% rename from images/diffid.go rename to core/images/diffid.go diff --git a/images/handlers.go b/core/images/handlers.go similarity index 100% rename from images/handlers.go rename to core/images/handlers.go diff --git a/images/image.go b/core/images/image.go similarity index 100% rename from images/image.go rename to core/images/image.go diff --git a/images/image_test.go b/core/images/image_test.go similarity index 100% rename from images/image_test.go rename to core/images/image_test.go diff --git a/images/imagetest/content.go b/core/images/imagetest/content.go similarity index 99% rename from images/imagetest/content.go rename to core/images/imagetest/content.go index e84f249d1..c42fb7b29 100644 --- a/images/imagetest/content.go +++ b/core/images/imagetest/content.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/imagetest/size.go b/core/images/imagetest/size.go similarity index 100% rename from images/imagetest/size.go rename to core/images/imagetest/size.go diff --git a/images/importexport.go b/core/images/importexport.go similarity index 100% rename from images/importexport.go rename to core/images/importexport.go diff --git a/images/labels.go b/core/images/labels.go similarity index 100% rename from images/labels.go rename to core/images/labels.go diff --git a/images/mediatypes.go b/core/images/mediatypes.go similarity index 100% rename from images/mediatypes.go rename to core/images/mediatypes.go diff --git a/images/usage/calculator.go b/core/images/usage/calculator.go similarity index 98% rename from images/usage/calculator.go rename to core/images/usage/calculator.go index fb98d4af4..7b2263a53 100644 --- a/images/usage/calculator.go +++ b/core/images/usage/calculator.go @@ -22,8 +22,8 @@ import ( "sync/atomic" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/snapshots" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/images/usage/calculator_test.go b/core/images/usage/calculator_test.go similarity index 96% rename from images/usage/calculator_test.go rename to core/images/usage/calculator_test.go index ac8887114..bbbde885f 100644 --- a/images/usage/calculator_test.go +++ b/core/images/usage/calculator_test.go @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/imagetest" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/imagetest" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log/logtest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/integration/client/client_test.go b/integration/client/client_test.go index e02137c70..ebdebbfbb 100644 --- a/integration/client/client_test.go +++ b/integration/client/client_test.go @@ -33,9 +33,9 @@ import ( "go.opentelemetry.io/otel" . "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" imagelist "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" diff --git a/integration/client/container_test.go b/integration/client/container_test.go index ebaa877bd..414be0ce5 100644 --- a/integration/client/container_test.go +++ b/integration/client/container_test.go @@ -35,8 +35,8 @@ import ( "github.com/containerd/containerd/v2/cio" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/containers" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/platforms" diff --git a/integration/client/convert_test.go b/integration/client/convert_test.go index 681e2eaee..4f5f19c80 100644 --- a/integration/client/convert_test.go +++ b/integration/client/convert_test.go @@ -20,9 +20,9 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/converter" - "github.com/containerd/containerd/v2/images/converter/uncompress" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/converter" + "github.com/containerd/containerd/v2/core/images/converter/uncompress" "github.com/containerd/containerd/v2/platforms" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/stretchr/testify/assert" diff --git a/integration/client/export_test.go b/integration/client/export_test.go index 6c384dcb7..144c947ca 100644 --- a/integration/client/export_test.go +++ b/integration/client/export_test.go @@ -27,9 +27,9 @@ import ( . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/platforms" "github.com/google/uuid" diff --git a/integration/client/image_test.go b/integration/client/image_test.go index ab75f2e31..dde3b84ba 100644 --- a/integration/client/image_test.go +++ b/integration/client/image_test.go @@ -24,9 +24,9 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" imagelist "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/platforms" diff --git a/integration/client/import_test.go b/integration/client/import_test.go index 9248e4ab6..de147e75c 100644 --- a/integration/client/import_test.go +++ b/integration/client/import_test.go @@ -36,8 +36,8 @@ import ( "github.com/containerd/containerd/v2/archive/tartest" . "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" diff --git a/integration/client/lease_test.go b/integration/client/lease_test.go index 0593daa2a..3594091b7 100644 --- a/integration/client/lease_test.go +++ b/integration/client/lease_test.go @@ -21,8 +21,8 @@ import ( "testing" . "github.com/containerd/containerd/v2/client" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" imagelist "github.com/containerd/containerd/v2/integration/images" "github.com/containerd/containerd/v2/leases" "github.com/opencontainers/image-spec/identity" diff --git a/metadata/adaptors.go b/metadata/adaptors.go index bbaee50ad..d7a164e81 100644 --- a/metadata/adaptors.go +++ b/metadata/adaptors.go @@ -21,8 +21,8 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/sandbox" "github.com/containerd/containerd/v2/snapshots" diff --git a/metadata/db_test.go b/metadata/db_test.go index 5329c2a47..95d00648e 100644 --- a/metadata/db_test.go +++ b/metadata/db_test.go @@ -31,9 +31,9 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/plugins/content/local" diff --git a/metadata/images.go b/metadata/images.go index d8b3a9245..75de608f6 100644 --- a/metadata/images.go +++ b/metadata/images.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/metadata/boltutil" "github.com/containerd/containerd/v2/namespaces" diff --git a/metadata/images_test.go b/metadata/images_test.go index f78f3f95d..4ace30c4f 100644 --- a/metadata/images_test.go +++ b/metadata/images_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/images" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/oci/spec_opts.go b/oci/spec_opts.go index 090d20087..82cb97bca 100644 --- a/oci/spec_opts.go +++ b/oci/spec_opts.go @@ -31,7 +31,7 @@ import ( "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/platforms" diff --git a/pkg/cri/server/images/check.go b/pkg/cri/server/images/check.go index 8616e0d52..bd3430084 100644 --- a/pkg/cri/server/images/check.go +++ b/pkg/cri/server/images/check.go @@ -21,7 +21,7 @@ import ( "fmt" "sync" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" ) diff --git a/pkg/cri/server/images/image_pull.go b/pkg/cri/server/images/image_pull.go index fd4b6fd05..4c8eb8efe 100644 --- a/pkg/cri/server/images/image_pull.go +++ b/pkg/cri/server/images/image_pull.go @@ -41,8 +41,8 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/diff" + containerdimages "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - containerdimages "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/cri/annotations" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" crilabels "github.com/containerd/containerd/v2/pkg/cri/labels" diff --git a/pkg/cri/server/images/image_remove.go b/pkg/cri/server/images/image_remove.go index 850218116..51d61a52b 100644 --- a/pkg/cri/server/images/image_remove.go +++ b/pkg/cri/server/images/image_remove.go @@ -21,8 +21,8 @@ import ( "fmt" eventstypes "github.com/containerd/containerd/v2/api/events" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/tracing" runtime "k8s.io/cri-api/pkg/apis/runtime/v1" diff --git a/pkg/cri/server/images/service.go b/pkg/cri/server/images/service.go index 1114a9386..4393baffd 100644 --- a/pkg/cri/server/images/service.go +++ b/pkg/cri/server/images/service.go @@ -22,8 +22,8 @@ import ( containerd "github.com/containerd/containerd/v2/client" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/events" - "github.com/containerd/containerd/v2/images" criconfig "github.com/containerd/containerd/v2/pkg/cri/config" imagestore "github.com/containerd/containerd/v2/pkg/cri/store/image" snapshotstore "github.com/containerd/containerd/v2/pkg/cri/store/snapshot" diff --git a/pkg/cri/store/image/image.go b/pkg/cri/store/image/image.go index ea8e08564..5f66fbaf6 100644 --- a/pkg/cri/store/image/image.go +++ b/pkg/cri/store/image/image.go @@ -23,9 +23,9 @@ import ( "sync" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/usage" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/usage" "github.com/containerd/containerd/v2/pkg/cri/labels" "github.com/containerd/containerd/v2/pkg/cri/util" "github.com/containerd/containerd/v2/platforms" diff --git a/pkg/display/manifest_printer.go b/pkg/display/manifest_printer.go index e9e846da7..8d8380c24 100644 --- a/pkg/display/manifest_printer.go +++ b/pkg/display/manifest_printer.go @@ -26,7 +26,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/snapshotters/annotations.go b/pkg/snapshotters/annotations.go index 8f33aa819..d6582e9a2 100644 --- a/pkg/snapshotters/annotations.go +++ b/pkg/snapshotters/annotations.go @@ -19,7 +19,7 @@ package snapshotters import ( "context" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/log" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/transfer/archive/exporter.go b/pkg/transfer/archive/exporter.go index 97440bed7..98a0a9119 100644 --- a/pkg/transfer/archive/exporter.go +++ b/pkg/transfer/archive/exporter.go @@ -26,8 +26,8 @@ import ( "github.com/containerd/containerd/v2/api/types" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer/plugins" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" diff --git a/pkg/transfer/archive/importer.go b/pkg/transfer/archive/importer.go index ba7e46a1f..00991801c 100644 --- a/pkg/transfer/archive/importer.go +++ b/pkg/transfer/archive/importer.go @@ -25,7 +25,7 @@ import ( transferapi "github.com/containerd/containerd/v2/api/types/transfer" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images/archive" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/pkg/streaming" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" "github.com/containerd/log" diff --git a/pkg/transfer/image/imagestore.go b/pkg/transfer/image/imagestore.go index e1aee0025..1109b07fe 100644 --- a/pkg/transfer/image/imagestore.go +++ b/pkg/transfer/image/imagestore.go @@ -26,9 +26,9 @@ import ( "github.com/containerd/containerd/v2/api/types" transfertypes "github.com/containerd/containerd/v2/api/types/transfer" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/core/images/archive" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" - "github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer/plugins" diff --git a/pkg/transfer/image/imagestore_test.go b/pkg/transfer/image/imagestore_test.go index a58f23845..ea4d4912e 100644 --- a/pkg/transfer/image/imagestore_test.go +++ b/pkg/transfer/image/imagestore_test.go @@ -23,8 +23,8 @@ import ( "sync" "testing" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/transfer/local/export.go b/pkg/transfer/local/export.go index 2b4031ed5..df63241f9 100644 --- a/pkg/transfer/local/export.go +++ b/pkg/transfer/local/export.go @@ -19,7 +19,7 @@ package local import ( "context" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/pkg/transfer" ) diff --git a/pkg/transfer/local/import.go b/pkg/transfer/local/import.go index 3867215f8..9b2c382c7 100644 --- a/pkg/transfer/local/import.go +++ b/pkg/transfer/local/import.go @@ -24,8 +24,8 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/log" diff --git a/pkg/transfer/local/pull.go b/pkg/transfer/local/pull.go index 41b036d7e..6f0a2d410 100644 --- a/pkg/transfer/local/pull.go +++ b/pkg/transfer/local/pull.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/remotes" diff --git a/pkg/transfer/local/push.go b/pkg/transfer/local/push.go index 9e84de092..c39c8ad2b 100644 --- a/pkg/transfer/local/push.go +++ b/pkg/transfer/local/push.go @@ -23,8 +23,8 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/remotes" diff --git a/pkg/transfer/local/transfer.go b/pkg/transfer/local/transfer.go index 8079e6f70..c00930469 100644 --- a/pkg/transfer/local/transfer.go +++ b/pkg/transfer/local/transfer.go @@ -26,8 +26,8 @@ import ( "golang.org/x/sync/semaphore" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/pkg/imageverifier" "github.com/containerd/containerd/v2/pkg/kmutex" diff --git a/pkg/transfer/transfer.go b/pkg/transfer/transfer.go index 9ea4e1699..69e672bf8 100644 --- a/pkg/transfer/transfer.go +++ b/pkg/transfer/transfer.go @@ -23,7 +23,7 @@ import ( ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" ) type Transferrer interface { diff --git a/pkg/unpack/unpacker.go b/pkg/unpack/unpacker.go index 902984fe9..52e516a7e 100644 --- a/pkg/unpack/unpacker.go +++ b/pkg/unpack/unpacker.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/core/content" "github.com/containerd/containerd/v2/core/diff" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/cleanup" diff --git a/remotes/docker/converter.go b/remotes/docker/converter.go index 4dc7673e7..95163ded3 100644 --- a/remotes/docker/converter.go +++ b/remotes/docker/converter.go @@ -23,7 +23,7 @@ import ( "fmt" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go index ec2f9f850..2ab1c3374 100644 --- a/remotes/docker/fetcher.go +++ b/remotes/docker/fetcher.go @@ -28,8 +28,8 @@ import ( "net/url" "strings" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" "github.com/klauspost/compress/zstd" diff --git a/remotes/docker/handler.go b/remotes/docker/handler.go index 042ca3c29..cf01f2294 100644 --- a/remotes/docker/handler.go +++ b/remotes/docker/handler.go @@ -23,7 +23,7 @@ import ( "strings" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/reference" "github.com/containerd/log" diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go index abfad23f1..39e12a337 100644 --- a/remotes/docker/pusher.go +++ b/remotes/docker/pusher.go @@ -29,8 +29,8 @@ import ( "time" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/remotes" remoteserrors "github.com/containerd/containerd/v2/remotes/errors" "github.com/containerd/log" diff --git a/remotes/docker/resolver.go b/remotes/docker/resolver.go index ac22c971a..a91584070 100644 --- a/remotes/docker/resolver.go +++ b/remotes/docker/resolver.go @@ -28,8 +28,8 @@ import ( "path" "strings" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/reference" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility. diff --git a/remotes/docker/schema1/converter.go b/remotes/docker/schema1/converter.go index bca146be4..86f86a60d 100644 --- a/remotes/docker/schema1/converter.go +++ b/remotes/docker/schema1/converter.go @@ -34,8 +34,8 @@ import ( "github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/remotes" "github.com/containerd/log" diff --git a/remotes/handlers.go b/remotes/handlers.go index d4f8302a6..ff21f59e4 100644 --- a/remotes/handlers.go +++ b/remotes/handlers.go @@ -26,8 +26,8 @@ import ( "sync" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/log" diff --git a/remotes/handlers_test.go b/remotes/handlers_test.go index 0ce6683db..734246a88 100644 --- a/remotes/handlers_test.go +++ b/remotes/handlers_test.go @@ -24,7 +24,7 @@ import ( "testing" "github.com/containerd/containerd/v2/core/content" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/plugins/content/local" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/services/images/helpers.go b/services/images/helpers.go index 68326d4e7..fe95c8c73 100644 --- a/services/images/helpers.go +++ b/services/images/helpers.go @@ -19,7 +19,7 @@ package images import ( imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" "github.com/containerd/containerd/v2/api/types" - "github.com/containerd/containerd/v2/images" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/protobuf" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/services/images/local.go b/services/images/local.go index f0a577328..a46248a9e 100644 --- a/services/images/local.go +++ b/services/images/local.go @@ -26,10 +26,10 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/gc" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/epoch" diff --git a/services/tasks/local.go b/services/tasks/local.go index cad903e61..e671a4990 100644 --- a/services/tasks/local.go +++ b/services/tasks/local.go @@ -32,10 +32,10 @@ import ( "github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/content" + "github.com/containerd/containerd/v2/core/images" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/filters" - "github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/blockio"