github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move content to core/content

Browse Source 
Signed-off-by: Derek McGowan <derek@mcg.dev>
This commit is contained in:
Derek McGowan 2024-01-17 09:50:32 -08:00
parent 846f7d4e65
commit 21b4f3f0aa
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
86 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/client.go
View File

@ -40,8 +40,8 @@ import (
versionservice "github.com/containerd/containerd/v2/api/services/version/v1" versionservice "github.com/containerd/containerd/v2/api/services/version/v1"
apitypes "github.com/containerd/containerd/v2/api/types" apitypes "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
contentproxy "github.com/containerd/containerd/v2/content/proxy" contentproxy "github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"

2
client/container_opts.go
View File

@ -23,7 +23,7 @@ import (
"fmt" "fmt"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"

2
client/container_restore_opts.go
View File

@ -22,7 +22,7 @@ import (
"fmt" "fmt"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/proto"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"

2
client/image.go
View File

@ -23,7 +23,7 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"

2
client/install.go
View File

@ -28,7 +28,7 @@ import (
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
) )

2
client/services.go
View File

@ -26,7 +26,7 @@ import (
namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1" namespacesapi "github.com/containerd/containerd/v2/api/services/namespaces/v1"
"github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"

2
client/signals.go
View File

@ -22,7 +22,7 @@ import (
"fmt" "fmt"
"syscall" "syscall"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/moby/sys/signal" "github.com/moby/sys/signal"
v1 "github.com/opencontainers/image-spec/specs-go/v1" v1 "github.com/opencontainers/image-spec/specs-go/v1"

2
client/task.go
View File

@ -29,7 +29,7 @@ import (
"github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/cio"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"

2
cmd/ctr/commands/content/content.go
View File

@ -28,7 +28,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log" "github.com/containerd/log"

2
cmd/ctr/commands/content/fetch.go
View File

@ -28,7 +28,7 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/progress"

2
cmd/ctr/commands/content/prune.go
View File

@ -22,7 +22,7 @@ import (
"unicode" "unicode"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"

2
cmd/ctr/commands/snapshots/snapshots.go
View File

@ -29,7 +29,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/progress"

2
contrib/fuzz/content_fuzzer.go
View File

@ -29,7 +29,7 @@ import (
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/images/archive"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
) )

2
contrib/fuzz/metadata_fuzzer.go
View File

@ -27,7 +27,7 @@ import (
bolt "go.etcd.io/bbolt" bolt "go.etcd.io/bbolt"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"

0
content/adaptor.go → core/content/adaptor.go
View File

0
content/adaptor_test.go → core/content/adaptor_test.go
View File

0
content/content.go → core/content/content.go
View File

0
content/helpers.go → core/content/helpers.go
View File

0
content/helpers_test.go → core/content/helpers_test.go
View File

0
content/proxy/content_reader.go → core/content/proxy/content_reader.go
View File

2
content/proxy/content_store.go → core/content/proxy/content_store.go
View File

@ -21,7 +21,7 @@ import (
"io" "io"
contentapi "github.com/containerd/containerd/v2/api/services/content/v1" contentapi "github.com/containerd/containerd/v2/api/services/content/v1"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
protobuftypes "github.com/containerd/containerd/v2/protobuf/types" protobuftypes "github.com/containerd/containerd/v2/protobuf/types"

2
content/proxy/content_writer.go → core/content/proxy/content_writer.go
View File

@ -22,7 +22,7 @@ import (
"io" "io"
contentapi "github.com/containerd/containerd/v2/api/services/content/v1" contentapi "github.com/containerd/containerd/v2/api/services/content/v1"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

2
content/testsuite/testsuite.go → core/content/testsuite/testsuite.go
View File

@ -28,7 +28,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"
"github.com/containerd/log/logtest" "github.com/containerd/log/logtest"

2
diff/apply/apply.go
View File

@ -22,7 +22,7 @@ import (
"io" "io"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/log" "github.com/containerd/log"

2
diff/lcow/lcow.go
View File

@ -30,7 +30,7 @@ import (
"github.com/Microsoft/go-winio/pkg/security" "github.com/Microsoft/go-winio/pkg/security"
"github.com/Microsoft/hcsshim/ext4/tar2ext4" "github.com/Microsoft/hcsshim/ext4/tar2ext4"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"

2
diff/walking/differ.go
View File

@ -27,7 +27,7 @@ import (
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"

2
diff/windows/cimfs.go
View File

@ -25,7 +25,7 @@ import (
"github.com/Microsoft/hcsshim/pkg/cimfs" "github.com/Microsoft/hcsshim/pkg/cimfs"
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"

2
diff/windows/windows.go
View File

@ -30,7 +30,7 @@ import (
"github.com/Microsoft/go-winio" "github.com/Microsoft/go-winio"
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"

2
images/archive/exporter.go
View File

@ -26,7 +26,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"

2
images/archive/importer.go
View File

@ -28,7 +28,7 @@ import (
"path" "path"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"

2
images/converter/converter.go
View File

@ -20,7 +20,7 @@ package converter
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"

2
images/converter/default.go
View File

@ -24,7 +24,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log" "github.com/containerd/log"

2
images/converter/uncompress/uncompress.go
View File

@ -22,7 +22,7 @@ import (
"io" "io"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/converter" "github.com/containerd/containerd/v2/images/converter"

2
images/diffid.go
View File

@ -24,7 +24,7 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/log" "github.com/containerd/log"
) )

2
images/handlers.go
View File

@ -22,7 +22,7 @@ import (
"fmt" "fmt"
"sort" "sort"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
images/image.go
View File

@ -23,7 +23,7 @@ import (
"sort" "sort"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log" "github.com/containerd/log"

2
images/imagetest/content.go
View File

@ -24,7 +24,7 @@ import (
"sync" "sync"
"testing" "testing"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
images/importexport.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"io" "io"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
images/usage/calculator.go
View File

@ -21,7 +21,7 @@ import (
"strings" "strings"
"sync/atomic" "sync/atomic"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"

2
integration/build_local_containerd_helper_test.go
View File

@ -24,7 +24,7 @@ import (
"time" "time"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/cri/constants" "github.com/containerd/containerd/v2/pkg/cri/constants"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"

4
integration/client/content_test.go
View File

@ -23,8 +23,8 @@ import (
"testing" "testing"
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/content/testsuite" "github.com/containerd/containerd/v2/core/content/testsuite"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
) )

2
integration/client/export_test.go
View File

@ -26,7 +26,7 @@ import (
"testing" "testing"
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/images/archive"

2
integration/client/import_test.go
View File

@ -35,7 +35,7 @@ import (
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/archive/tartest" "github.com/containerd/containerd/v2/archive/tartest"
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/images/archive"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"

2
integration/image_pull_timeout_test.go
View File

@ -39,7 +39,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"

2
metadata/adaptors.go
View File

@ -20,7 +20,7 @@ import (
"strings" "strings"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"

2
metadata/content.go
View File

@ -25,7 +25,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/filters"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"

4
metadata/content_test.go
View File

@ -25,8 +25,8 @@ import (
"sync/atomic" "sync/atomic"
"testing" "testing"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/content/testsuite" "github.com/containerd/containerd/v2/core/content/testsuite"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"

2
metadata/db.go
View File

@ -27,7 +27,7 @@ import (
"time" "time"
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/gc"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"

2
metadata/db_test.go
View File

@ -30,7 +30,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/gc" "github.com/containerd/containerd/v2/gc"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"

2
metadata/plugin/plugin.go
View File

@ -22,7 +22,7 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"

2
oci/client.go
View File

@ -19,7 +19,7 @@ package oci
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/snapshots"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
oci/spec_opts.go
View File

@ -30,7 +30,7 @@ import (
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi" "github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"

2
oci/spec_opts_test.go
View File

@ -37,7 +37,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/namespaces"
) )

2
pkg/cri/server/images/service.go
View File

@ -21,7 +21,7 @@ import (
"time" "time"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config" criconfig "github.com/containerd/containerd/v2/pkg/cri/config"

2
pkg/cri/store/image/image.go
View File

@ -22,7 +22,7 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/usage" "github.com/containerd/containerd/v2/images/usage"

2
pkg/display/manifest_printer.go
View File

@ -25,7 +25,7 @@ import (
"os" "os"
"strings" "strings"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
pkg/transfer/archive/exporter.go
View File

@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
transfertypes "github.com/containerd/containerd/v2/api/types/transfer" transfertypes "github.com/containerd/containerd/v2/api/types/transfer"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/images/archive"
"github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/streaming"

2
pkg/transfer/archive/importer.go
View File

@ -24,7 +24,7 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
transferapi "github.com/containerd/containerd/v2/api/types/transfer" transferapi "github.com/containerd/containerd/v2/api/types/transfer"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/images/archive"
"github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/streaming"
tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming" tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming"

2
pkg/transfer/image/imagestore.go
View File

@ -25,7 +25,7 @@ import (
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
transfertypes "github.com/containerd/containerd/v2/api/types/transfer" transfertypes "github.com/containerd/containerd/v2/api/types/transfer"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/images/archive"

2
pkg/transfer/local/import.go
View File

@ -23,7 +23,7 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"

2
pkg/transfer/local/progress.go
View File

@ -22,7 +22,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log" "github.com/containerd/log"

2
pkg/transfer/local/pull.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"

2
pkg/transfer/local/push.go
View File

@ -22,7 +22,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"

2
pkg/transfer/local/transfer.go
View File

@ -25,7 +25,7 @@ import (
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"golang.org/x/sync/semaphore" "golang.org/x/sync/semaphore"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/leases"

2
pkg/transfer/transfer.go
View File

@ -22,7 +22,7 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
) )

2
pkg/unpack/unpacker.go
View File

@ -28,7 +28,7 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"

2
plugins/content/local/content_local_fuzzer.go
View File

@ -28,7 +28,7 @@ import (
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
) )
func FuzzContentStoreWriter(data []byte) int { func FuzzContentStoreWriter(data []byte) int {

2
plugins/content/local/readerat.go
View File

@ -21,7 +21,7 @@ import (
"io" "io"
"os" "os"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
) )

2
plugins/content/local/store.go
View File

@ -27,7 +27,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/filters"
"github.com/containerd/log" "github.com/containerd/log"

4
plugins/content/local/store_test.go
View File

@ -32,8 +32,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/content/testsuite" "github.com/containerd/containerd/v2/core/content/testsuite"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/randutil" "github.com/containerd/containerd/v2/pkg/randutil"
"github.com/containerd/containerd/v2/pkg/testutil" "github.com/containerd/containerd/v2/pkg/testutil"

2
plugins/content/local/test_helper.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"testing" "testing"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
) )
func contentStoreEnv(t testing.TB) (context.Context, string, content.Store, func()) { func contentStoreEnv(t testing.TB) (context.Context, string, content.Store, func()) {

2
plugins/content/local/writer.go
View File

@ -26,7 +26,7 @@ import (
"runtime" "runtime"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
remotes/docker/converter.go
View File

@ -22,7 +22,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log" "github.com/containerd/log"

2
remotes/docker/handler.go
View File

@ -22,7 +22,7 @@ import (
"net/url" "net/url"
"strings" "strings"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/reference" "github.com/containerd/containerd/v2/reference"

2
remotes/docker/pusher.go
View File

@ -28,7 +28,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/remotes"

2
remotes/docker/pusher_test.go
View File

@ -29,7 +29,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/reference" "github.com/containerd/containerd/v2/reference"
"github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/remotes"

2
remotes/docker/schema1/converter.go
View File

@ -33,7 +33,7 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"

2
remotes/docker/status.go
View File

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"sync" "sync"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/moby/locker" "github.com/moby/locker"
) )

2
remotes/handlers.go
View File

@ -25,7 +25,7 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/labels"

2
remotes/handlers_test.go
View File

@ -23,7 +23,7 @@ import (
"sync" "sync"
"testing" "testing"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/plugins/content/local" "github.com/containerd/containerd/v2/plugins/content/local"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"

2
remotes/resolver.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
"io" "io"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
services/content/contentserver/contentserver.go
View File

@ -23,7 +23,7 @@ import (
"sync" "sync"
api "github.com/containerd/containerd/v2/api/services/content/v1" api "github.com/containerd/containerd/v2/api/services/content/v1"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"

2
services/content/service.go
View File

@ -17,7 +17,7 @@
package content package content
import ( import (
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/services"
"github.com/containerd/containerd/v2/services/content/contentserver" "github.com/containerd/containerd/v2/services/content/contentserver"

2
services/content/store.go
View File

@ -20,7 +20,7 @@ import (
"context" "context"
eventstypes "github.com/containerd/containerd/v2/api/events" eventstypes "github.com/containerd/containerd/v2/api/events"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/metadata" "github.com/containerd/containerd/v2/metadata"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"

2
services/server/server.go
View File

@ -50,7 +50,7 @@ import (
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1" sbapi "github.com/containerd/containerd/v2/api/services/sandbox/v1"
ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1" ssapi "github.com/containerd/containerd/v2/api/services/snapshots/v1"
csproxy "github.com/containerd/containerd/v2/content/proxy" csproxy "github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/diff"
diffproxy "github.com/containerd/containerd/v2/diff/proxy" diffproxy "github.com/containerd/containerd/v2/diff/proxy"

2
services/tasks/local.go
View File

@ -31,7 +31,7 @@ import (
"github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/archive"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/containers"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/events"
"github.com/containerd/containerd/v2/filters" "github.com/containerd/containerd/v2/filters"