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

Move remotes to core/remotes

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

4
client/client.go
View File

@ -45,6 +45,8 @@ import (
"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/defaults"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/events"
@ -53,8 +55,6 @@ import (
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/plugins"
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"

2
client/client_opts.go
View File

@ -20,8 +20,8 @@ import (
"time"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes"
"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"

6
client/pull.go
View File

@ -25,12 +25,12 @@ import (
"golang.org/x/sync/semaphore"
"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/core/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/unpack"
"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"
)

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

@ -29,8 +29,8 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
units "github.com/docker/go-units"
digest "github.com/opencontainers/go-digest"

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

@ -30,10 +30,10 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/progress"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

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

@ -30,13 +30,13 @@ import (
"github.com/containerd/containerd/v2/cmd/ctr/commands"
"github.com/containerd/containerd/v2/cmd/ctr/commands/content"
"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/transfer"
"github.com/containerd/containerd/v2/pkg/transfer/image"
"github.com/containerd/containerd/v2/pkg/transfer/registry"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/log"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

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

@ -31,10 +31,10 @@ import (
"strings"
"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/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/containerd/v2/remotes/docker/config"
"github.com/containerd/log"
"github.com/urfave/cli"
)

2
remotes/docker/auth/fetch.go → core/remotes/docker/auth/fetch.go
View File

@ -26,7 +26,7 @@ import (
"strings"
"time"
remoteserrors "github.com/containerd/containerd/v2/remotes/errors"
remoteserrors "github.com/containerd/containerd/v2/core/remotes/errors"
"github.com/containerd/containerd/v2/version"
"github.com/containerd/log"
)

0
remotes/docker/auth/fetch_test.go → core/remotes/docker/auth/fetch_test.go
View File

0
remotes/docker/auth/parse.go → core/remotes/docker/auth/parse.go
View File

0
remotes/docker/auth/parse_test.go → core/remotes/docker/auth/parse_test.go
View File

4
remotes/docker/authorizer.go → core/remotes/docker/authorizer.go
View File

@ -25,9 +25,9 @@ import (
"strings"
"sync"
"github.com/containerd/containerd/v2/core/remotes/docker/auth"
remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/remotes/docker/auth"
remoteerrors "github.com/containerd/containerd/v2/remotes/errors"
"github.com/containerd/log"
)

0
remotes/docker/config/config_unix.go → core/remotes/docker/config/config_unix.go
View File

0
remotes/docker/config/config_windows.go → core/remotes/docker/config/config_windows.go
View File

0
remotes/docker/config/docker_fuzzer_internal.go → core/remotes/docker/config/docker_fuzzer_internal.go
View File

2
remotes/docker/config/hosts.go → core/remotes/docker/config/hosts.go
View File

@ -30,8 +30,8 @@ import (
"strings"
"time"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/log"
"github.com/pelletier/go-toml/v2"
tomlu "github.com/pelletier/go-toml/v2/unstable"

2
remotes/docker/config/hosts_test.go → core/remotes/docker/config/hosts_test.go
View File

@ -26,7 +26,7 @@ import (
"path/filepath"
"testing"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/log/logtest"
)

2
remotes/docker/converter.go → core/remotes/docker/converter.go
View File

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

0
remotes/docker/converter_fuzz.go → core/remotes/docker/converter_fuzz.go
View File

0
remotes/docker/errcode.go → core/remotes/docker/errcode.go
View File

0
remotes/docker/errdesc.go → core/remotes/docker/errdesc.go
View File

2
remotes/docker/fetcher.go → core/remotes/docker/fetcher.go
View File

@ -29,8 +29,8 @@ import (
"strings"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
"github.com/klauspost/compress/zstd"
digest "github.com/opencontainers/go-digest"

0
remotes/docker/fetcher_fuzz.go → core/remotes/docker/fetcher_fuzz.go
View File

0
remotes/docker/fetcher_test.go → core/remotes/docker/fetcher_test.go
View File

0
remotes/docker/handler.go → core/remotes/docker/handler.go
View File

0
remotes/docker/handler_test.go → core/remotes/docker/handler_test.go
View File

0
remotes/docker/httpreadseeker.go → core/remotes/docker/httpreadseeker.go
View File

4
remotes/docker/pusher.go → core/remotes/docker/pusher.go
View File

@ -30,9 +30,9 @@ import (
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes"
remoteserrors "github.com/containerd/containerd/v2/core/remotes/errors"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/remotes"
remoteserrors "github.com/containerd/containerd/v2/remotes/errors"
"github.com/containerd/log"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
remotes/docker/pusher_test.go → core/remotes/docker/pusher_test.go
View File

@ -30,9 +30,9 @@ import (
"testing"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/reference"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log/logtest"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

0
remotes/docker/registry.go → core/remotes/docker/registry.go
View File

0
remotes/docker/registry_test.go → core/remotes/docker/registry_test.go
View File

6
remotes/docker/resolver.go → core/remotes/docker/resolver.go
View File

@ -29,11 +29,11 @@ import (
"strings"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/reference"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
remoteerrors "github.com/containerd/containerd/v2/remotes/errors"
"github.com/containerd/containerd/v2/tracing"
"github.com/containerd/containerd/v2/version"
"github.com/containerd/log"

6
remotes/docker/resolver_test.go → core/remotes/docker/resolver_test.go
View File

@ -32,10 +32,10 @@ import (
"testing"
"time"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker/auth"
remoteerrors "github.com/containerd/containerd/v2/core/remotes/errors"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker/auth"
remoteerrors "github.com/containerd/containerd/v2/remotes/errors"
digest "github.com/opencontainers/go-digest"
specs "github.com/opencontainers/image-spec/specs-go"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

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

@ -35,9 +35,9 @@ import (
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
digest "github.com/opencontainers/go-digest"
specs "github.com/opencontainers/image-spec/specs-go"

0
remotes/docker/scope.go → core/remotes/docker/scope.go
View File

0
remotes/docker/scope_test.go → core/remotes/docker/scope_test.go
View File

0
remotes/docker/status.go → core/remotes/docker/status.go
View File

0
remotes/errors/errors.go → core/remotes/errors/errors.go
View File

0
remotes/handlers.go → core/remotes/handlers.go
View File

0
remotes/handlers_test.go → core/remotes/handlers_test.go
View File

0
remotes/resolver.go → core/remotes/resolver.go
View File

4
pkg/cri/server/images/image_pull.go
View File

@ -42,13 +42,13 @@ import (
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/diff"
containerdimages "github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/core/remotes/docker/config"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/cri/annotations"
criconfig "github.com/containerd/containerd/v2/pkg/cri/config"
crilabels "github.com/containerd/containerd/v2/pkg/cri/labels"
snpkg "github.com/containerd/containerd/v2/pkg/snapshotters"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/containerd/v2/remotes/docker/config"
"github.com/containerd/containerd/v2/tracing"
)

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

@ -28,12 +28,12 @@ import (
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/images/archive"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/streaming"
"github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/pkg/transfer/plugins"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
)
func init() {

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

@ -23,8 +23,8 @@ import (
"time"
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

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

@ -22,12 +22,12 @@ import (
"github.com/containerd/containerd/v2/core/content"
"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/defaults"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/pkg/unpack"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/log"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/sirupsen/logrus"

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

@ -24,10 +24,10 @@ import (
"github.com/containerd/containerd/v2/core/content"
"github.com/containerd/containerd/v2/core/images"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/platforms"
"github.com/containerd/containerd/v2/remotes"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

4
pkg/transfer/registry/registry.go
View File

@ -26,12 +26,12 @@ import (
"sync"
transfertypes "github.com/containerd/containerd/v2/api/types/transfer"
"github.com/containerd/containerd/v2/core/remotes"
"github.com/containerd/containerd/v2/core/remotes/docker"
"github.com/containerd/containerd/v2/pkg/streaming"
"github.com/containerd/containerd/v2/pkg/transfer"
"github.com/containerd/containerd/v2/pkg/transfer/plugins"
tstreaming "github.com/containerd/containerd/v2/pkg/transfer/streaming"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker"
"github.com/containerd/log"
"github.com/containerd/typeurl/v2"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"