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

Merge pull request #9306 from dmcgowan/containerd-v2-module

Browse Source 
Containerd v2 module
This commit is contained in:
Akihiro Suda
2023-11-01 15:20:35 +00:00
committed by GitHub
parent d8d2b79e1d 5fdf55e493
commit 19ff94b701
921 changed files with 3313 additions and 53225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
remotes/docker/auth/fetch.go
View File

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

6
remotes/docker/authorizer.go
View File

@@ -25,9 +25,9 @@ import (
"strings"
"sync"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/remotes/docker/auth"
remoteerrors "github.com/containerd/containerd/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"
)

4
remotes/docker/config/hosts.go
View File

@@ -30,8 +30,8 @@ import (
"strings"
"time"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/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
View File

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

6
remotes/docker/converter.go
View File

@@ -22,9 +22,9 @@ import (
"encoding/json"
"fmt"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
remotes/docker/converter_fuzz.go
View File

@@ -23,7 +23,7 @@ import (
"os"
fuzz "github.com/AdaLogics/go-fuzz-headers"
"github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/v2/content/local"
"github.com/containerd/log"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

6
remotes/docker/fetcher.go
View File

@@ -26,9 +26,9 @@ import (
"net/url"
"strings"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

8
remotes/docker/handler.go
View File

@@ -22,10 +22,10 @@ import (
"net/url"
"strings"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/reference"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/reference"
"github.com/containerd/log"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
)

4
remotes/docker/handler_test.go
View File

@@ -20,8 +20,8 @@ import (
"reflect"
"testing"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/reference"
"github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/reference"
)
func TestAppendDistributionLabel(t *testing.T) {

2
remotes/docker/httpreadseeker.go
View File

@@ -21,7 +21,7 @@ import (
"fmt"
"io"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/log"
)

10
remotes/docker/pusher.go
View File

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

8
remotes/docker/pusher_test.go
View File

@@ -29,10 +29,10 @@ import (
"strings"
"testing"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/reference"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/v2/content"
"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"

16
remotes/docker/resolver.go
View File

@@ -28,14 +28,14 @@ import (
"path"
"strings"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/reference"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
remoteerrors "github.com/containerd/containerd/remotes/errors"
"github.com/containerd/containerd/tracing"
"github.com/containerd/containerd/version"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/reference"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/containerd/v2/remotes/docker/schema1" //nolint:staticcheck // Ignore SA1019. Need to keep deprecated package for compatibility.
remoteerrors "github.com/containerd/containerd/v2/remotes/errors"
"github.com/containerd/containerd/v2/tracing"
"github.com/containerd/containerd/v2/version"
"github.com/containerd/log"
"github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

8
remotes/docker/resolver_test.go
View File

@@ -32,10 +32,10 @@ import (
"testing"
"time"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker/auth"
remoteerrors "github.com/containerd/containerd/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"

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

@@ -32,12 +32,12 @@ import (
"sync"
"time"
"github.com/containerd/containerd/archive/compression"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/labels"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/v2/archive/compression"
"github.com/containerd/containerd/v2/content"
"github.com/containerd/containerd/v2/errdefs"
"github.com/containerd/containerd/v2/images"
"github.com/containerd/containerd/v2/labels"
"github.com/containerd/containerd/v2/remotes"
"github.com/containerd/log"
digest "github.com/opencontainers/go-digest"
specs "github.com/opencontainers/image-spec/specs-go"

2
remotes/docker/scope.go
View File

@@ -23,7 +23,7 @@ import (
"sort"
"strings"
"github.com/containerd/containerd/reference"
"github.com/containerd/containerd/v2/reference"
)
// RepositoryScope returns a repository scope string such as "repository:foo/bar:pull"

2
remotes/docker/scope_test.go
View File

@@ -20,7 +20,7 @@ import (
"context"
"testing"
"github.com/containerd/containerd/reference"
"github.com/containerd/containerd/v2/reference"
"github.com/stretchr/testify/assert"
)

4
remotes/docker/status.go
View File

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