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

Merge pull request #9790 from dmcgowan/mv-transfer-packages

Browse Source 
Move transfer and unpack packages to core
This commit is contained in:
Maksym Pavlenko
2024-02-10 16:49:55 +00:00
committed by GitHub
parent 8ccc902cd1 634ac2f8fa
commit 128f249f0e
36 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/services/streaming/service.go
View File

@@ -21,7 +21,7 @@ import (
"io"
api "github.com/containerd/containerd/v2/api/services/streaming/v1"
"github.com/containerd/containerd/v2/pkg/streaming"
"github.com/containerd/containerd/v2/core/streaming"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/containerd/v2/protobuf"
ptypes "github.com/containerd/containerd/v2/protobuf/types"

6
plugins/services/transfer/service.go
View File

@@ -22,10 +22,10 @@ import (
transferapi "github.com/containerd/containerd/v2/api/services/transfer/v1"
"github.com/containerd/containerd/v2/api/types"
transferTypes "github.com/containerd/containerd/v2/api/types/transfer"
"github.com/containerd/containerd/v2/core/streaming"
"github.com/containerd/containerd/v2/core/transfer"
tplugins "github.com/containerd/containerd/v2/core/transfer/plugins"
"github.com/containerd/containerd/v2/pkg/oci"
"github.com/containerd/containerd/v2/pkg/streaming"
"github.com/containerd/containerd/v2/pkg/transfer"
tplugins "github.com/containerd/containerd/v2/pkg/transfer/plugins"
"github.com/containerd/containerd/v2/plugins"
ptypes "github.com/containerd/containerd/v2/protobuf/types"
"github.com/containerd/errdefs"

2
plugins/streaming/manager.go
View File

@@ -23,9 +23,9 @@ import (
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/streaming"
"github.com/containerd/containerd/v2/pkg/gc"
"github.com/containerd/containerd/v2/pkg/namespaces"
"github.com/containerd/containerd/v2/pkg/streaming"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/errdefs"
"github.com/containerd/plugin"

10
plugins/transfer/plugin.go
View File

@@ -22,9 +22,9 @@ import (
"github.com/containerd/containerd/v2/core/diff"
"github.com/containerd/containerd/v2/core/leases"
"github.com/containerd/containerd/v2/core/metadata"
"github.com/containerd/containerd/v2/core/transfer/local"
"github.com/containerd/containerd/v2/core/unpack"
"github.com/containerd/containerd/v2/pkg/imageverifier"
"github.com/containerd/containerd/v2/pkg/transfer/local"
"github.com/containerd/containerd/v2/pkg/unpack"
"github.com/containerd/containerd/v2/plugins"
"github.com/containerd/errdefs"
"github.com/containerd/log"
@@ -33,9 +33,9 @@ import (
"github.com/containerd/plugin/registry"
// Load packages with type registrations
_ "github.com/containerd/containerd/v2/pkg/transfer/archive"
_ "github.com/containerd/containerd/v2/pkg/transfer/image"
_ "github.com/containerd/containerd/v2/pkg/transfer/registry"
_ "github.com/containerd/containerd/v2/core/transfer/archive"
_ "github.com/containerd/containerd/v2/core/transfer/image"
_ "github.com/containerd/containerd/v2/core/transfer/registry"
)
// Register local transfer service plugin