Skip to content

Commit 9eef9d7

Browse files
tonistiigitonistiigi
authored
Merge pull request moby#5507 from slonopotamus/containerd-2
Upgrade to containerd 2
2 parents b04f342 + 654a5c0 commit 9eef9d7

File tree

1,214 files changed

+61292
-34143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,214 files changed

+61292
-34143
lines changed

‎cache/blobs.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"os"
88
"strconv"
99

10-
"github.com/containerd/containerd/diff"
11-
"github.com/containerd/containerd/diff/walking"
12-
"github.com/containerd/containerd/labels"
13-
"github.com/containerd/containerd/leases"
14-
"github.com/containerd/containerd/mount"
10+
"github.com/containerd/containerd/v2/core/diff"
11+
"github.com/containerd/containerd/v2/core/leases"
12+
"github.com/containerd/containerd/v2/core/mount"
13+
"github.com/containerd/containerd/v2/pkg/labels"
14+
"github.com/containerd/containerd/v2/plugins/diff/walking"
1515
"github.com/moby/buildkit/session"
1616
"github.com/moby/buildkit/util/bklog"
1717
"github.com/moby/buildkit/util/compression"

‎cache/blobs_linux.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"context"
88
"io"
99

10-
"github.com/containerd/containerd/content"
11-
labelspkg "github.com/containerd/containerd/labels"
12-
"github.com/containerd/containerd/mount"
10+
"github.com/containerd/containerd/v2/core/content"
11+
"github.com/containerd/containerd/v2/core/mount"
12+
labelspkg "github.com/containerd/containerd/v2/pkg/labels"
1313
cerrdefs "github.com/containerd/errdefs"
1414
"github.com/moby/buildkit/util/bklog"
1515
"github.com/moby/buildkit/util/compression"

‎cache/blobs_nolinux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package cache
55
import (
66
"context"
77

8-
"github.com/containerd/containerd/mount"
8+
"github.com/containerd/containerd/v2/core/mount"
99
"github.com/moby/buildkit/util/compression"
1010
ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
1111
"github.com/pkg/errors"

‎cache/compression_nydus.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"context"
88
"io"
99

10-
"github.com/containerd/containerd/content"
11-
"github.com/containerd/containerd/labels"
10+
"github.com/containerd/containerd/v2/core/content"
11+
"github.com/containerd/containerd/v2/pkg/labels"
1212
cerrdefs "github.com/containerd/errdefs"
1313
"github.com/moby/buildkit/session"
1414
"github.com/moby/buildkit/util/compression"

‎cache/contenthash/checksum_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
"testing"
1212
"time"
1313

14-
"github.com/containerd/containerd/content/local"
15-
"github.com/containerd/containerd/diff/apply"
16-
"github.com/containerd/containerd/diff/walking"
17-
ctdmetadata "github.com/containerd/containerd/metadata"
18-
"github.com/containerd/containerd/snapshots"
19-
"github.com/containerd/containerd/snapshots/native"
14+
"github.com/containerd/containerd/v2/core/diff/apply"
15+
ctdmetadata "github.com/containerd/containerd/v2/core/metadata"
16+
"github.com/containerd/containerd/v2/core/snapshots"
17+
"github.com/containerd/containerd/v2/plugins/content/local"
18+
"github.com/containerd/containerd/v2/plugins/diff/walking"
19+
"github.com/containerd/containerd/v2/plugins/snapshots/native"
2020
"github.com/moby/buildkit/cache"
2121
"github.com/moby/buildkit/cache/metadata"
2222
"github.com/moby/buildkit/session"

‎cache/filelist.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"path"
1010
"sort"
1111

12-
cdcompression "github.com/containerd/containerd/archive/compression"
12+
cdcompression "github.com/containerd/containerd/v2/pkg/archive/compression"
1313
"github.com/moby/buildkit/session"
1414
)
1515

‎cache/manager.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"sync"
99
"time"
1010

11-
"github.com/containerd/containerd/content"
12-
"github.com/containerd/containerd/diff"
13-
"github.com/containerd/containerd/filters"
14-
"github.com/containerd/containerd/gc"
15-
"github.com/containerd/containerd/labels"
16-
"github.com/containerd/containerd/leases"
11+
"github.com/containerd/containerd/v2/core/content"
12+
"github.com/containerd/containerd/v2/core/diff"
13+
"github.com/containerd/containerd/v2/core/leases"
14+
"github.com/containerd/containerd/v2/pkg/filters"
15+
"github.com/containerd/containerd/v2/pkg/gc"
16+
"github.com/containerd/containerd/v2/pkg/labels"
1717
cerrdefs "github.com/containerd/errdefs"
1818
"github.com/docker/docker/pkg/idtools"
1919
"github.com/moby/buildkit/cache/metadata"

‎cache/manager_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ import (
1818
"testing"
1919
"time"
2020

21-
ctdcompression "github.com/containerd/containerd/archive/compression"
22-
"github.com/containerd/containerd/archive/tarheader"
23-
"github.com/containerd/containerd/content"
24-
"github.com/containerd/containerd/content/local"
25-
"github.com/containerd/containerd/diff/apply"
26-
"github.com/containerd/containerd/diff/walking"
27-
"github.com/containerd/containerd/labels"
28-
"github.com/containerd/containerd/leases"
29-
ctdmetadata "github.com/containerd/containerd/metadata"
30-
"github.com/containerd/containerd/mount"
31-
"github.com/containerd/containerd/namespaces"
32-
"github.com/containerd/containerd/snapshots"
33-
"github.com/containerd/containerd/snapshots/native"
21+
"github.com/containerd/containerd/v2/core/content"
22+
"github.com/containerd/containerd/v2/core/diff/apply"
23+
"github.com/containerd/containerd/v2/core/leases"
24+
ctdmetadata "github.com/containerd/containerd/v2/core/metadata"
25+
"github.com/containerd/containerd/v2/core/mount"
26+
"github.com/containerd/containerd/v2/core/snapshots"
27+
ctdcompression "github.com/containerd/containerd/v2/pkg/archive/compression"
28+
"github.com/containerd/containerd/v2/pkg/archive/tarheader"
29+
"github.com/containerd/containerd/v2/pkg/labels"
30+
"github.com/containerd/containerd/v2/pkg/namespaces"
31+
"github.com/containerd/containerd/v2/plugins/content/local"
32+
"github.com/containerd/containerd/v2/plugins/diff/walking"
33+
"github.com/containerd/containerd/v2/plugins/snapshots/native"
3434
"github.com/containerd/continuity/fs/fstest"
3535
cerrdefs "github.com/containerd/errdefs"
3636
"github.com/containerd/stargz-snapshotter/estargz"

‎cache/migrate_v2.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import (
66
"os"
77
"time"
88

9-
"github.com/containerd/containerd/content"
10-
"github.com/containerd/containerd/images"
11-
"github.com/containerd/containerd/leases"
12-
"github.com/containerd/containerd/snapshots"
9+
"github.com/containerd/containerd/v2/core/content"
10+
"github.com/containerd/containerd/v2/core/images"
11+
"github.com/containerd/containerd/v2/core/leases"
12+
"github.com/containerd/containerd/v2/core/snapshots"
1313
cerrdefs "github.com/containerd/errdefs"
1414
"github.com/moby/buildkit/cache/metadata"
1515
"github.com/moby/buildkit/snapshot"

‎cache/opts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cache
33
import (
44
"fmt"
55

6-
"github.com/containerd/containerd/content"
6+
"github.com/containerd/containerd/v2/core/content"
77
"github.com/moby/buildkit/session"
88
"github.com/moby/buildkit/util/progress"
99
digest "github.com/opencontainers/go-digest"

0 commit comments

Comments
 (0)