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

Merge pull request #9365 from dmcgowan/move-packages

Browse Source 
Move packages based on contributing guide
This commit is contained in:
Fu Wei
2024-01-18 14:04:44 +00:00
committed by GitHub
parent aad37698ed 94d1b20988
commit 02e0fef84b
730 changed files with 1525 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -182,7 +182,7 @@ protos: bin/protoc-gen-go-fieldpath
find v2 -name '*.pb.go' -exec sh -c 'f={}; mkdir -p $$(dirname "$${f#v2/}"); echo mv $$f $${f#v2/}; mv $$f $${f#v2/}' \; find v2 -name '*.pb.go' -exec sh -c 'f={}; mkdir -p $$(dirname "$${f#v2/}"); echo mv $$f $${f#v2/}; mv $$f $${f#v2/}' \;
@mv ${TMPDIR}/vendor ${ROOTDIR} @mv ${TMPDIR}/vendor ${ROOTDIR}
@rm -rf ${TMPDIR} v2 @rm -rf ${TMPDIR} v2
go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ runtime/ -name '*.pb.go') go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find api/ core/runtime/ -name '*.pb.go')
check-protos: protos ## check if protobufs needs to be generated again check-protos: protos ## check if protobufs needs to be generated again
@echo "$(WHALE) $@" @echo "$(WHALE) $@"

4
Protobuild.toml
View File

@@ -14,8 +14,8 @@ generators = ["go"]
after = ["/usr/local/include", "/usr/include"] after = ["/usr/local/include", "/usr/include"]
[[descriptors]] [[descriptors]]
prefix = "github.com/containerd/containerd/runtime/v2/runc/options" prefix = "github.com/containerd/containerd/core/runtime/v2/runc/options"
target = "runtime/v2/runc/options/next.pb.txt" target = "core/runtime/v2/runc/options/next.pb.txt"
ignore_files = [ ignore_files = [
"google/protobuf/descriptor.proto", "google/protobuf/descriptor.proto",
] ]

2
Vagrantfile vendored
View File

@@ -257,7 +257,7 @@ EOF
set -eux -o pipefail set -eux -o pipefail
rm -rf /var/lib/containerd-test /run/containerd-test rm -rf /var/lib/containerd-test /run/containerd-test
cd ${GOPATH}/src/github.com/containerd/containerd cd ${GOPATH}/src/github.com/containerd/containerd
go test -v -count=1 -race ./metrics/cgroups go test -v -count=1 -race ./core/metrics/cgroups
make integration EXTRA_TESTFLAGS="-timeout 15m -no-criu -test.v" TEST_RUNTIME=io.containerd.runc.v2 RUNC_FLAVOR=$RUNC_FLAVOR make integration EXTRA_TESTFLAGS="-timeout 15m -no-criu -test.v" TEST_RUNTIME=io.containerd.runc.v2 RUNC_FLAVOR=$RUNC_FLAVOR
SHELL SHELL
end end

32
client/client.go
View File

@@ -39,27 +39,27 @@ import (
"github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1"
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/core/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/core/images"
"github.com/containerd/containerd/v2/core/leases"
leasesproxy "github.com/containerd/containerd/v2/core/leases/proxy"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/core/sandbox"
sandboxproxy "github.com/containerd/containerd/v2/core/sandbox/proxy"
"github.com/containerd/containerd/v2/core/snapshots"
snproxy "github.com/containerd/containerd/v2/core/snapshots/proxy"
"github.com/containerd/containerd/v2/defaults" "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"
"github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/plugins/services/introspection"
ptypes "github.com/containerd/containerd/v2/protobuf/types" ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/containerd/v2/sandbox"
sandboxproxy "github.com/containerd/containerd/v2/sandbox/proxy"
"github.com/containerd/containerd/v2/services/introspection"
"github.com/containerd/containerd/v2/snapshots"
snproxy "github.com/containerd/containerd/v2/snapshots/proxy"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"

6
client/client_opts.go
View File

@@ -19,10 +19,10 @@ package client
import ( import (
"time" "time"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/snapshots"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"google.golang.org/grpc" "google.golang.org/grpc"

12
client/container.go
View File

@@ -27,13 +27,13 @@ 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"
tasktypes "github.com/containerd/containerd/v2/api/types/task" 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/containers" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/fifo" "github.com/containerd/fifo"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
ver "github.com/opencontainers/image-spec/specs-go" ver "github.com/opencontainers/image-spec/specs-go"

10
client/container_checkpoint_opts.go
View File

@@ -24,14 +24,14 @@ import (
"runtime" "runtime"
tasks "github.com/containerd/containerd/v2/api/services/tasks/v1" tasks "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/diff" "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/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/pkg/rootfs"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/rootfs"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
imagespec "github.com/opencontainers/image-spec/specs-go/v1" imagespec "github.com/opencontainers/image-spec/specs-go/v1"
) )

14
client/container_opts.go
View File

@@ -22,14 +22,14 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/core/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/core/images"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
v1 "github.com/opencontainers/image-spec/specs-go/v1" v1 "github.com/opencontainers/image-spec/specs-go/v1"

6
client/container_opts_unix.go
View File

@@ -25,9 +25,9 @@ import (
"path/filepath" "path/filepath"
"syscall" "syscall"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
) )

6
client/container_restore_opts.go
View File

@@ -21,9 +21,9 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/core/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/core/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"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"

4
client/containerstore.go
View File

@@ -22,8 +22,8 @@ import (
"io" "io"
containersapi "github.com/containerd/containerd/v2/api/services/containers/v1" containersapi "github.com/containerd/containerd/v2/api/services/containers/v1"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/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"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"

4
client/diff.go
View File

@@ -18,8 +18,8 @@ package client
import ( import (
diffapi "github.com/containerd/containerd/v2/api/services/diff/v1" diffapi "github.com/containerd/containerd/v2/api/services/diff/v1"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/diff/proxy" "github.com/containerd/containerd/v2/core/diff/proxy"
) )
// DiffService handles the computation and application of diffs // DiffService handles the computation and application of diffs

4
client/events.go
View File

@@ -20,8 +20,8 @@ import (
"context" "context"
eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" eventsapi "github.com/containerd/containerd/v2/api/services/events/v1"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

2
client/export.go
View File

@@ -20,7 +20,7 @@ import (
"context" "context"
"io" "io"
"github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/core/images/archive"
) )
// Export exports images to a Tar stream. // Export exports images to a Tar stream.

2
client/grpc.go
View File

@@ -19,7 +19,7 @@ package client
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

18
client/image.go
View File

@@ -23,16 +23,16 @@ 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/core/diff"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/core/images/usage"
"github.com/containerd/containerd/v2/images/usage" "github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/labels" "github.com/containerd/containerd/v2/internal/kmutex"
"github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/labels"
"github.com/containerd/containerd/v2/pkg/rootfs"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/rootfs"
"github.com/containerd/containerd/v2/snapshots"
"github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"

6
client/image_store.go
View File

@@ -20,10 +20,10 @@ import (
"context" "context"
imagesapi "github.com/containerd/containerd/v2/api/services/images/v1" imagesapi "github.com/containerd/containerd/v2/api/services/images/v1"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/oci"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/oci"
"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"
"google.golang.org/protobuf/types/known/timestamppb" "google.golang.org/protobuf/types/known/timestamppb"

6
client/import.go
View File

@@ -20,9 +20,9 @@ import (
"context" "context"
"io" "io"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/core/images/archive"
"github.com/containerd/containerd/v2/images/archive" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
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"

8
client/install.go
View File

@@ -26,10 +26,10 @@ import (
"runtime" "runtime"
"strings" "strings"
"github.com/containerd/containerd/v2/archive" "github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/archive/compression" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/pkg/archive"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/archive/compression"
) )
// Install a binary image into the opt service. // Install a binary image into the opt service.

2
client/lease.go
View File

@@ -20,7 +20,7 @@ import (
"context" "context"
"time" "time"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/core/leases"
) )
// WithLease attaches a lease on the context // WithLease attaches a lease on the context

4
client/namespaces.go
View File

@@ -21,8 +21,8 @@ import (
"strings" "strings"
api "github.com/containerd/containerd/v2/api/services/namespaces/v1" api "github.com/containerd/containerd/v2/api/services/namespaces/v1"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
) )

4
client/process.go
View File

@@ -24,8 +24,8 @@ import (
"time" "time"
"github.com/containerd/containerd/v2/api/services/tasks/v1" "github.com/containerd/containerd/v2/api/services/tasks/v1"
"github.com/containerd/containerd/v2/cio" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
) )

12
client/pull.go
View File

@@ -24,14 +24,14 @@ import (
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"golang.org/x/sync/semaphore" "golang.org/x/sync/semaphore"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/core/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/tracing"
"github.com/containerd/containerd/v2/pkg/unpack" "github.com/containerd/containerd/v2/pkg/unpack"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/containerd/v2/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
"github.com/containerd/containerd/v2/tracing"
) )
const ( const (

8
client/sandbox.go
View File

@@ -22,11 +22,11 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs" api "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
api "github.com/containerd/containerd/v2/sandbox"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

18
client/services.go
View File

@@ -25,16 +25,16 @@ import (
introspectionapi "github.com/containerd/containerd/v2/api/services/introspection/v1" introspectionapi "github.com/containerd/containerd/v2/api/services/introspection/v1"
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/core/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/core/images"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/core/sandbox"
"github.com/containerd/containerd/v2/core/snapshots"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/sandbox" srv "github.com/containerd/containerd/v2/plugins/services"
srv "github.com/containerd/containerd/v2/services" "github.com/containerd/containerd/v2/plugins/services/introspection"
"github.com/containerd/containerd/v2/services/introspection"
"github.com/containerd/containerd/v2/snapshots"
"github.com/containerd/plugin" "github.com/containerd/plugin"
) )

4
client/signals.go
View File

@@ -22,8 +22,8 @@ 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/core/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/snapshotter_opts_unix.go
View File

@@ -22,7 +22,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
) )
const ( const (

2
client/snapshotter_opts_windows.go
View File

@@ -19,7 +19,7 @@ package client
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/snapshots" "github.com/containerd/containerd/v2/core/snapshots"
) )
func resolveSnapshotOptions(ctx context.Context, client *Client, snapshotterName string, snapshotter snapshots.Snapshotter, parent string, opts ...snapshots.Opt) (string, error) { func resolveSnapshotOptions(ctx context.Context, client *Client, snapshotterName string, snapshotter snapshots.Snapshotter, parent string, opts ...snapshots.Opt) (string, error) {

18
client/task.go
View File

@@ -28,18 +28,18 @@ 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/core/content"
"github.com/containerd/containerd/v2/content" "github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/diff" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/rootfs"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf"
google_protobuf "github.com/containerd/containerd/v2/protobuf/types" google_protobuf "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/containerd/v2/rootfs"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
is "github.com/opencontainers/image-spec/specs-go" is "github.com/opencontainers/image-spec/specs-go"

8
client/task_opts.go
View File

@@ -23,10 +23,10 @@ import (
"syscall" "syscall"
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )

2
client/task_opts_unix.go
View File

@@ -22,7 +22,7 @@ import (
"context" "context"
"errors" "errors"
"github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
) )
// WithNoNewKeyring causes tasks not to be created with a new keyring for secret storage. // WithNoNewKeyring causes tasks not to be created with a new keyring for secret storage.

2
client/transfer.go
View File

@@ -23,7 +23,7 @@ import (
streamingapi "github.com/containerd/containerd/v2/api/services/streaming/v1" streamingapi "github.com/containerd/containerd/v2/api/services/streaming/v1"
transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1" transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/streaming" "github.com/containerd/containerd/v2/pkg/streaming"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/pkg/transfer/proxy" "github.com/containerd/containerd/v2/pkg/transfer/proxy"

2
cmd/containerd-shim-runc-v2/main.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/manager"
_ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause" _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/pause"
_ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task/plugin" _ "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task/plugin"
"github.com/containerd/containerd/v2/runtime/v2/shim" "github.com/containerd/containerd/v2/core/runtime/v2/shim"
) )
func main() { func main() {

10
cmd/containerd-shim-runc-v2/manager/manager_linux.go
View File

@@ -32,12 +32,12 @@ import (
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/schedcore" "github.com/containerd/containerd/v2/pkg/schedcore"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/runtime/v2/shim"
runcC "github.com/containerd/go-runc" runcC "github.com/containerd/go-runc"
"github.com/containerd/log" "github.com/containerd/log"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

2
cmd/containerd-shim-runc-v2/pause/sandbox.go
View File

@@ -24,9 +24,9 @@ import (
api "github.com/containerd/containerd/v2/api/runtime/sandbox/v1" api "github.com/containerd/containerd/v2/api/runtime/sandbox/v1"
"github.com/containerd/containerd/v2/api/types" "github.com/containerd/containerd/v2/api/types"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

2
cmd/containerd-shim-runc-v2/process/deleted_state.go
View File

@@ -24,7 +24,7 @@ import (
"fmt" "fmt"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
google_protobuf "github.com/containerd/containerd/v2/protobuf/types" google_protobuf "github.com/containerd/containerd/v2/protobuf/types"
) )

2
cmd/containerd-shim-runc-v2/process/exec.go
View File

@@ -31,7 +31,7 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/fifo" "github.com/containerd/fifo"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"

2
cmd/containerd-shim-runc-v2/process/init.go
View File

@@ -32,7 +32,7 @@ import (
"time" "time"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
google_protobuf "github.com/containerd/containerd/v2/protobuf/types" google_protobuf "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/fifo" "github.com/containerd/fifo"

2
cmd/containerd-shim-runc-v2/process/io.go
View File

@@ -32,7 +32,7 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/fifo" "github.com/containerd/fifo"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"

2
cmd/containerd-shim-runc-v2/process/io_test.go
View File

@@ -24,7 +24,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
) )
func TestNewBinaryIO(t *testing.T) { func TestNewBinaryIO(t *testing.T) {

2
cmd/containerd-shim-runc-v2/process/utils.go
View File

@@ -30,7 +30,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"

8
cmd/containerd-shim-runc-v2/runc/container.go
View File

@@ -32,11 +32,11 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/api/runtime/task/v3"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

2
cmd/containerd-shim-runc-v2/runc/platform.go
View File

@@ -30,7 +30,7 @@ import (
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/fifo" "github.com/containerd/fifo"
) )

2
cmd/containerd-shim-runc-v2/runc/util.go
View File

@@ -22,7 +22,7 @@ import (
"context" "context"
"path/filepath" "path/filepath"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )

2
cmd/containerd-shim-runc-v2/task/plugin/plugin_linux.go
View File

@@ -18,9 +18,9 @@ package plugin
import ( import (
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/task"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
) )

12
cmd/containerd-shim-runc-v2/task/service.go
View File

@@ -32,20 +32,20 @@ import (
"github.com/containerd/containerd/v2/api/types/task" "github.com/containerd/containerd/v2/api/types/task"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process"
"github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/runtime"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/core/runtime/v2/shim"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oom" "github.com/containerd/containerd/v2/pkg/oom"
oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1"
oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2"
"github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/shutdown"
"github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/stdio"
"github.com/containerd/containerd/v2/pkg/sys/reaper"
"github.com/containerd/containerd/v2/pkg/userns" "github.com/containerd/containerd/v2/pkg/userns"
"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"
"github.com/containerd/containerd/v2/runtime"
"github.com/containerd/containerd/v2/runtime/v2/runc/options"
"github.com/containerd/containerd/v2/runtime/v2/shim"
"github.com/containerd/containerd/v2/sys/reaper"
runcC "github.com/containerd/go-runc" runcC "github.com/containerd/go-runc"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"

6
cmd/containerd-stress/density.go
View File

@@ -29,10 +29,10 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

4
cmd/containerd-stress/exec_worker.go
View File

@@ -23,9 +23,9 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/log" "github.com/containerd/log"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
) )

2
cmd/containerd-stress/main.go
View File

@@ -30,7 +30,7 @@ import (
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/integration/remote" "github.com/containerd/containerd/v2/integration/remote"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
"github.com/containerd/log" "github.com/containerd/log"
metrics "github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"

4
cmd/containerd-stress/worker.go
View File

@@ -23,9 +23,9 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/v2/cio"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/log" "github.com/containerd/log"
) )

2
cmd/containerd/builtins/btrfs_linux.go
View File

@@ -18,4 +18,4 @@
package builtins package builtins
import _ "github.com/containerd/containerd/v2/snapshots/btrfs/plugin" import _ "github.com/containerd/containerd/v2/plugins/snapshots/btrfs/plugin"

48
cmd/containerd/builtins/builtins.go
View File

@@ -18,33 +18,33 @@ package builtins
// register containerd builtins here // register containerd builtins here
import ( import (
_ "github.com/containerd/containerd/v2/diff/walking/plugin" _ "github.com/containerd/containerd/v2/core/runtime/v2"
_ "github.com/containerd/containerd/v2/events/plugin" _ "github.com/containerd/containerd/v2/pkg/events/plugin"
_ "github.com/containerd/containerd/v2/gc/scheduler"
_ "github.com/containerd/containerd/v2/leases/plugin"
_ "github.com/containerd/containerd/v2/metadata/plugin"
_ "github.com/containerd/containerd/v2/pkg/nri/plugin" _ "github.com/containerd/containerd/v2/pkg/nri/plugin"
_ "github.com/containerd/containerd/v2/plugins/diff/walking/plugin"
_ "github.com/containerd/containerd/v2/plugins/gc"
_ "github.com/containerd/containerd/v2/plugins/imageverifier" _ "github.com/containerd/containerd/v2/plugins/imageverifier"
_ "github.com/containerd/containerd/v2/plugins/leases"
_ "github.com/containerd/containerd/v2/plugins/metadata"
_ "github.com/containerd/containerd/v2/plugins/restart"
_ "github.com/containerd/containerd/v2/plugins/sandbox" _ "github.com/containerd/containerd/v2/plugins/sandbox"
_ "github.com/containerd/containerd/v2/plugins/services/containers"
_ "github.com/containerd/containerd/v2/plugins/services/content"
_ "github.com/containerd/containerd/v2/plugins/services/diff"
_ "github.com/containerd/containerd/v2/plugins/services/events"
_ "github.com/containerd/containerd/v2/plugins/services/healthcheck"
_ "github.com/containerd/containerd/v2/plugins/services/images"
_ "github.com/containerd/containerd/v2/plugins/services/introspection"
_ "github.com/containerd/containerd/v2/plugins/services/leases"
_ "github.com/containerd/containerd/v2/plugins/services/namespaces"
_ "github.com/containerd/containerd/v2/plugins/services/opt"
_ "github.com/containerd/containerd/v2/plugins/services/sandbox"
_ "github.com/containerd/containerd/v2/plugins/services/snapshots"
_ "github.com/containerd/containerd/v2/plugins/services/streaming"
_ "github.com/containerd/containerd/v2/plugins/services/tasks"
_ "github.com/containerd/containerd/v2/plugins/services/transfer"
_ "github.com/containerd/containerd/v2/plugins/services/version"
_ "github.com/containerd/containerd/v2/plugins/services/warning"
_ "github.com/containerd/containerd/v2/plugins/streaming" _ "github.com/containerd/containerd/v2/plugins/streaming"
_ "github.com/containerd/containerd/v2/plugins/transfer" _ "github.com/containerd/containerd/v2/plugins/transfer"
_ "github.com/containerd/containerd/v2/runtime/restart/monitor"
_ "github.com/containerd/containerd/v2/runtime/v2"
_ "github.com/containerd/containerd/v2/services/containers"
_ "github.com/containerd/containerd/v2/services/content"
_ "github.com/containerd/containerd/v2/services/diff"
_ "github.com/containerd/containerd/v2/services/events"
_ "github.com/containerd/containerd/v2/services/healthcheck"
_ "github.com/containerd/containerd/v2/services/images"
_ "github.com/containerd/containerd/v2/services/introspection"
_ "github.com/containerd/containerd/v2/services/leases"
_ "github.com/containerd/containerd/v2/services/namespaces"
_ "github.com/containerd/containerd/v2/services/opt"
_ "github.com/containerd/containerd/v2/services/sandbox"
_ "github.com/containerd/containerd/v2/services/snapshots"
_ "github.com/containerd/containerd/v2/services/streaming"
_ "github.com/containerd/containerd/v2/services/tasks"
_ "github.com/containerd/containerd/v2/services/transfer"
_ "github.com/containerd/containerd/v2/services/version"
_ "github.com/containerd/containerd/v2/services/warning"
) )

12
cmd/containerd/builtins/builtins_linux.go
View File

@@ -17,10 +17,10 @@
package builtins package builtins
import ( import (
_ "github.com/containerd/containerd/v2/metrics/cgroups" _ "github.com/containerd/containerd/v2/core/metrics/cgroups"
_ "github.com/containerd/containerd/v2/metrics/cgroups/v2" _ "github.com/containerd/containerd/v2/core/metrics/cgroups/v2"
_ "github.com/containerd/containerd/v2/runtime/v2/runc/options" _ "github.com/containerd/containerd/v2/core/runtime/v2/runc/options"
_ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
_ "github.com/containerd/containerd/v2/snapshots/overlay/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/overlay/plugin"
) )

4
cmd/containerd/builtins/builtins_unix.go
View File

@@ -19,6 +19,6 @@
package builtins package builtins
import ( import (
_ "github.com/containerd/containerd/v2/snapshots/blockfile/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/blockfile/plugin"
_ "github.com/containerd/containerd/v2/snapshots/native/plugin" _ "github.com/containerd/containerd/v2/plugins/snapshots/native/plugin"
) )

8
cmd/containerd/builtins/builtins_windows.go
View File

@@ -17,8 +17,8 @@
package builtins package builtins
import ( import (
_ "github.com/containerd/containerd/v2/diff/lcow" _ "github.com/containerd/containerd/v2/plugins/diff/lcow"
_ "github.com/containerd/containerd/v2/diff/windows" _ "github.com/containerd/containerd/v2/plugins/diff/windows"
_ "github.com/containerd/containerd/v2/snapshots/lcow" _ "github.com/containerd/containerd/v2/plugins/snapshots/lcow"
_ "github.com/containerd/containerd/v2/snapshots/windows" _ "github.com/containerd/containerd/v2/plugins/snapshots/windows"
) )

2
cmd/containerd/builtins/devmapper_linux.go
View File

@@ -18,4 +18,4 @@
package builtins package builtins
import _ "github.com/containerd/containerd/v2/snapshots/devmapper/plugin" import _ "github.com/containerd/containerd/v2/plugins/snapshots/devmapper/plugin"

2
cmd/containerd/builtins/tracing.go
View File

@@ -19,5 +19,5 @@
package builtins package builtins
import ( import (
_ "github.com/containerd/containerd/v2/tracing/plugin" _ "github.com/containerd/containerd/v2/pkg/tracing/plugin"
) )

6
cmd/containerd/command/config.go
View File

@@ -21,11 +21,11 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/containerd/containerd/v2/cmd/containerd/server"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/services/server"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pelletier/go-toml/v2" "github.com/pelletier/go-toml/v2"

12
cmd/containerd/command/main.go
View File

@@ -27,13 +27,13 @@ import (
"runtime" "runtime"
"time" "time"
"github.com/containerd/containerd/v2/cmd/containerd/server"
srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
_ "github.com/containerd/containerd/v2/core/metrics" // import containerd build info
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
_ "github.com/containerd/containerd/v2/metrics" // import containerd build info "github.com/containerd/containerd/v2/pkg/sys"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/services/server"
srvconfig "github.com/containerd/containerd/v2/services/server/config"
"github.com/containerd/containerd/v2/sys"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"

2
cmd/containerd/command/main_unix.go
View File

@@ -23,7 +23,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/containerd/containerd/v2/services/server" "github.com/containerd/containerd/v2/cmd/containerd/server"
"github.com/containerd/log" "github.com/containerd/log"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )

2
cmd/containerd/command/main_windows.go
View File

@@ -26,7 +26,7 @@ import (
"github.com/Microsoft/go-winio/pkg/etw" "github.com/Microsoft/go-winio/pkg/etw"
"github.com/Microsoft/go-winio/pkg/etwlogrus" "github.com/Microsoft/go-winio/pkg/etwlogrus"
"github.com/Microsoft/go-winio/pkg/guid" "github.com/Microsoft/go-winio/pkg/guid"
"github.com/containerd/containerd/v2/services/server" "github.com/containerd/containerd/v2/cmd/containerd/server"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"

2
cmd/containerd/command/oci-hook.go
View File

@@ -25,7 +25,7 @@ import (
"syscall" "syscall"
"text/template" "text/template"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

4
cmd/containerd/command/publish.go
View File

@@ -25,9 +25,9 @@ import (
"time" "time"
eventsapi "github.com/containerd/containerd/v2/api/services/events/v1" eventsapi "github.com/containerd/containerd/v2/api/services/events/v1"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/protobuf/proto" "github.com/containerd/containerd/v2/protobuf/proto"
"github.com/containerd/containerd/v2/protobuf/types" "github.com/containerd/containerd/v2/protobuf/types"
"github.com/urfave/cli" "github.com/urfave/cli"

2
cmd/containerd/command/service_unsupported.go
View File

@@ -19,7 +19,7 @@
package command package command
import ( import (
"github.com/containerd/containerd/v2/services/server" "github.com/containerd/containerd/v2/cmd/containerd/server"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

4
cmd/containerd/command/service_windows.go
View File

@@ -24,8 +24,8 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/cmd/containerd/server"
"github.com/containerd/containerd/v2/services/server" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/urfave/cli" "github.com/urfave/cli"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"

2
cmd/containerd/main.go
View File

@@ -22,7 +22,7 @@ import (
"os" "os"
"github.com/containerd/containerd/v2/cmd/containerd/command" "github.com/containerd/containerd/v2/cmd/containerd/command"
"github.com/containerd/containerd/v2/pkg/hasher" "github.com/containerd/containerd/v2/internal/hasher"
"github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies "github.com/containerd/containerd/v2/pkg/seed" //nolint:staticcheck // Global math/rand seed is deprecated, but still used by external dependencies
_ "github.com/containerd/containerd/v2/cmd/containerd/builtins" _ "github.com/containerd/containerd/v2/cmd/containerd/builtins"

2
services/server/config/config.go → cmd/containerd/server/config/config.go
View File

@@ -35,7 +35,7 @@ import (
"dario.cat/mergo" "dario.cat/mergo"
"github.com/pelletier/go-toml/v2" "github.com/pelletier/go-toml/v2"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/plugin" "github.com/containerd/plugin"
) )

0
services/server/config/config_test.go → cmd/containerd/server/config/config_test.go
View File

2
services/server/namespace.go → cmd/containerd/server/namespace.go
View File

@@ -19,7 +19,7 @@ package server
import ( import (
"context" "context"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

18
services/server/server.go → cmd/containerd/server/server.go
View File

@@ -50,21 +50,21 @@ 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"
"github.com/containerd/containerd/v2/content/local" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
csproxy "github.com/containerd/containerd/v2/content/proxy" csproxy "github.com/containerd/containerd/v2/core/content/proxy"
"github.com/containerd/containerd/v2/core/diff"
diffproxy "github.com/containerd/containerd/v2/core/diff/proxy"
sbproxy "github.com/containerd/containerd/v2/core/sandbox/proxy"
ssproxy "github.com/containerd/containerd/v2/core/snapshots/proxy"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/diff"
diffproxy "github.com/containerd/containerd/v2/diff/proxy"
"github.com/containerd/containerd/v2/pkg/deprecation" "github.com/containerd/containerd/v2/pkg/deprecation"
"github.com/containerd/containerd/v2/pkg/dialer" "github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/containerd/v2/pkg/sys"
"github.com/containerd/containerd/v2/pkg/timeout" "github.com/containerd/containerd/v2/pkg/timeout"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
sbproxy "github.com/containerd/containerd/v2/sandbox/proxy" "github.com/containerd/containerd/v2/plugins/content/local"
srvconfig "github.com/containerd/containerd/v2/services/server/config" "github.com/containerd/containerd/v2/plugins/services/warning"
"github.com/containerd/containerd/v2/services/warning"
ssproxy "github.com/containerd/containerd/v2/snapshots/proxy"
"github.com/containerd/containerd/v2/sys"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/dynamic" "github.com/containerd/plugin/dynamic"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"

4
services/server/server_linux.go → cmd/containerd/server/server_linux.go
View File

@@ -23,8 +23,8 @@ import (
"github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3"
cgroup1 "github.com/containerd/cgroups/v3/cgroup1" cgroup1 "github.com/containerd/cgroups/v3/cgroup1"
cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
srvconfig "github.com/containerd/containerd/v2/services/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/containerd/v2/sys" "github.com/containerd/containerd/v2/pkg/sys"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"

2
services/server/server_solaris.go → cmd/containerd/server/server_solaris.go
View File

@@ -19,7 +19,7 @@ package server
import ( import (
"context" "context"
srvconfig "github.com/containerd/containerd/v2/services/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
) )
func apply(_ context.Context, _ *srvconfig.Config) error { func apply(_ context.Context, _ *srvconfig.Config) error {

2
services/server/server_test.go → cmd/containerd/server/server_test.go
View File

@@ -20,7 +20,7 @@ import (
"context" "context"
"testing" "testing"
srvconfig "github.com/containerd/containerd/v2/services/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/plugin" "github.com/containerd/plugin"
"github.com/containerd/plugin/registry" "github.com/containerd/plugin/registry"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

2
services/server/server_unsupported.go → cmd/containerd/server/server_unsupported.go
View File

@@ -21,7 +21,7 @@ package server
import ( import (
"context" "context"
srvconfig "github.com/containerd/containerd/v2/services/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
) )

2
services/server/server_windows.go → cmd/containerd/server/server_windows.go
View File

@@ -19,7 +19,7 @@ package server
import ( import (
"context" "context"
srvconfig "github.com/containerd/containerd/v2/services/server/config" srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
"github.com/containerd/ttrpc" "github.com/containerd/ttrpc"
) )

2
cmd/ctr/app/main.go
View File

@@ -42,7 +42,7 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks"
versionCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/version" versionCmd "github.com/containerd/containerd/v2/cmd/ctr/commands/version"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/version" "github.com/containerd/containerd/v2/version"
) )

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

@@ -20,8 +20,8 @@ import (
gocontext "context" gocontext "context"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/namespaces"
"github.com/containerd/containerd/v2/pkg/epoch" "github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

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

@@ -21,7 +21,7 @@ import (
"fmt" "fmt"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
) )

2
cmd/ctr/commands/containers/checkpoint.go
View File

@@ -22,7 +22,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/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

6
cmd/ctr/commands/containers/containers.go
View File

@@ -23,12 +23,12 @@ import (
"strings" "strings"
"text/tabwriter" "text/tabwriter"
"github.com/containerd/containerd/v2/cio"
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/cmd/ctr/commands/run" "github.com/containerd/containerd/v2/cmd/ctr/commands/run"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/urfave/cli" "github.com/urfave/cli"

4
cmd/ctr/commands/containers/restore.go
View File

@@ -20,11 +20,11 @@ import (
"errors" "errors"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/cio"
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/cmd/ctr/commands/tasks" "github.com/containerd/containerd/v2/cmd/ctr/commands/tasks"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/cio"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

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

@@ -28,9 +28,9 @@ 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/core/remotes"
"github.com/containerd/containerd/v2/remotes" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
units "github.com/docker/go-units" units "github.com/docker/go-units"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"

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

@@ -28,12 +28,12 @@ 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/core/images"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log" "github.com/containerd/log"
"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"

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

@@ -22,8 +22,8 @@ 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/core/leases"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

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

@@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/events" "github.com/containerd/containerd/v2/pkg/events"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/containerd/typeurl/v2" "github.com/containerd/typeurl/v2"
"github.com/urfave/cli" "github.com/urfave/cli"

4
cmd/ctr/commands/images/convert.go
View File

@@ -21,8 +21,8 @@ import (
"fmt" "fmt"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/images/converter" "github.com/containerd/containerd/v2/core/images/converter"
"github.com/containerd/containerd/v2/images/converter/uncompress" "github.com/containerd/containerd/v2/core/images/converter/uncompress"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/ctr/commands/images/export.go
View File

@@ -25,7 +25,7 @@ import (
"github.com/urfave/cli" "github.com/urfave/cli"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "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" "github.com/containerd/containerd/v2/pkg/transfer"
tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive"
"github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/containerd/containerd/v2/pkg/transfer/image"

4
cmd/ctr/commands/images/images.go
View File

@@ -25,8 +25,8 @@ import (
"text/tabwriter" "text/tabwriter"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/images" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/log" "github.com/containerd/log"

2
cmd/ctr/commands/images/import.go
View File

@@ -27,7 +27,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/images/archive" "github.com/containerd/containerd/v2/core/images/archive"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"
tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive" tarchive "github.com/containerd/containerd/v2/pkg/transfer/archive"
"github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/containerd/containerd/v2/pkg/transfer/image"

6
cmd/ctr/commands/images/mount.go
View File

@@ -22,10 +22,10 @@ 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/core/leases"
"github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/defaults" "github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/leases"
"github.com/containerd/containerd/v2/mount"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
"github.com/urfave/cli" "github.com/urfave/cli"

2
cmd/ctr/commands/images/pull.go
View File

@@ -27,7 +27,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/cmd/ctr/commands/content" "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/progress"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/containerd/containerd/v2/pkg/transfer/image"

6
cmd/ctr/commands/images/push.go
View File

@@ -29,14 +29,14 @@ 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/cmd/ctr/commands/content" "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/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/pkg/progress" "github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/pkg/transfer" "github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/containerd/containerd/v2/pkg/transfer/image"
"github.com/containerd/containerd/v2/pkg/transfer/registry" "github.com/containerd/containerd/v2/pkg/transfer/registry"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/log" "github.com/containerd/log"
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"

2
cmd/ctr/commands/images/tag.go
View File

@@ -22,7 +22,7 @@ import (
"github.com/urfave/cli" "github.com/urfave/cli"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/containerd/v2/pkg/transfer/image" "github.com/containerd/containerd/v2/pkg/transfer/image"
"github.com/distribution/reference" "github.com/distribution/reference"
) )

6
cmd/ctr/commands/images/unmount.go
View File

@@ -20,9 +20,9 @@ import (
"fmt" "fmt"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/leases" "github.com/containerd/containerd/v2/core/mount"
"github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

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

@@ -25,7 +25,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/leases" "github.com/containerd/containerd/v2/core/leases"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

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

@@ -25,7 +25,7 @@ import (
"text/tabwriter" "text/tabwriter"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/pkg/errdefs"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

4
cmd/ctr/commands/namespaces/namespaces_linux.go
View File

@@ -17,8 +17,8 @@
package namespaces package namespaces
import ( import (
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/core/runtime/opts"
"github.com/containerd/containerd/v2/runtime/opts" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

2
cmd/ctr/commands/namespaces/namespaces_other.go
View File

@@ -19,7 +19,7 @@
package namespaces package namespaces
import ( import (
"github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

4
cmd/ctr/commands/oci/oci.go
View File

@@ -22,8 +22,8 @@ import (
"github.com/urfave/cli" "github.com/urfave/cli"
"github.com/containerd/containerd/v2/cmd/ctr/commands" "github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/containers" "github.com/containerd/containerd/v2/core/containers"
"github.com/containerd/containerd/v2/oci" "github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/platforms"
) )

6
cmd/ctr/commands/resolver.go
View File

@@ -31,10 +31,10 @@ import (
"strings" "strings"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/core/remotes/docker/config"
"github.com/containerd/containerd/v2/pkg/transfer/registry" "github.com/containerd/containerd/v2/pkg/transfer/registry"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/containerd/v2/remotes/docker/config"
"github.com/containerd/log" "github.com/containerd/log"
"github.com/urfave/cli" "github.com/urfave/cli"
) )

Some files were not shown because too many files have changed in this diff Show More