Skip to content

Commit c5d2944

Browse files
Fricounetimeoer
Fricounet
authored and
imeoer
committed
[nydusify] Bump containerd to v2
This commit bumps containerd to v2 in nydusify. This is needed to be able to bump the acceleration-service and nydus-snapshotter libs as well since both now rely on containerd v2. Signed-off-by: Baptiste Girard-Carrabin <[email protected]>
1 parent bef57c4 commit c5d2944

File tree

35 files changed

+497
-489
lines changed

35 files changed

+497
-489
lines changed

‎contrib/nydus-overlayfs/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/dragonflyoss/nydus/contrib/nydus-overlayfs
22

3-
go 1.24.0
3+
go 1.24.3
44

55
require (
66
github.com/pkg/errors v0.9.1

‎contrib/nydusify/cmd/nydusify.go‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ import (
1616
"runtime"
1717
"strings"
1818

19-
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/optimizer"
20-
21-
"github.com/containerd/containerd/reference/docker"
2219
"github.com/distribution/reference"
2320
"github.com/dustin/go-humanize"
2421
"github.com/pkg/errors"
@@ -30,6 +27,7 @@ import (
3027
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/committer"
3128
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/converter"
3229
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/copier"
30+
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/optimizer"
3331
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/packer"
3432
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/provider"
3533
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/utils"
@@ -103,14 +101,14 @@ func getBackendConfig(c *cli.Context, prefix string, required bool) (string, str
103101
// Source: localhost:5000/nginx:latest
104102
// Target: localhost:5000/nginx:latest-suffix
105103
func addReferenceSuffix(source, suffix string) (string, error) {
106-
named, err := docker.ParseDockerRef(source)
104+
named, err := reference.ParseDockerRef(source)
107105
if err != nil {
108106
return "", fmt.Errorf("invalid source image reference: %s", err)
109107
}
110-
if _, ok := named.(docker.Digested); ok {
108+
if _, ok := named.(reference.Digested); ok {
111109
return "", fmt.Errorf("unsupported digested image reference: %s", named.String())
112110
}
113-
named = docker.TagNameOnly(named)
111+
named = reference.TagNameOnly(named)
114112
target := named.String() + suffix
115113
return target, nil
116114
}
@@ -141,11 +139,11 @@ func getCacheReference(c *cli.Context, target string) (string, error) {
141139
return "", fmt.Errorf("--build-cache conflicts with --build-cache-tag")
142140
}
143141
if cacheTag != "" {
144-
named, err := docker.ParseDockerRef(target)
142+
named, err := reference.ParseDockerRef(target)
145143
if err != nil {
146144
return "", fmt.Errorf("invalid target image reference: %s", err)
147145
}
148-
cache = fmt.Sprintf("%s/%s:%s", docker.Domain(named), docker.Path(named), cacheTag)
146+
cache = fmt.Sprintf("%s/%s:%s", reference.Domain(named), reference.Path(named), cacheTag)
149147
}
150148
return cache, nil
151149
}

‎contrib/nydusify/go.mod‎

Lines changed: 89 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,132 @@
11
module github.com/dragonflyoss/nydus/contrib/nydusify
22

3-
go 1.24.0
4-
5-
toolchain go1.24.0
3+
go 1.24.3
64

75
require (
6+
github.com/BraveY/snapshotter-converter v0.0.5
7+
github.com/CloudNativeAI/model-spec v0.0.2
8+
github.com/agiledragon/gomonkey/v2 v2.13.0
89
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
9-
github.com/aws/aws-sdk-go-v2 v1.24.1
10-
github.com/aws/aws-sdk-go-v2/config v1.26.6
11-
github.com/aws/aws-sdk-go-v2/credentials v1.16.16
12-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15
13-
github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1
14-
github.com/containerd/containerd v1.7.18
15-
github.com/containerd/continuity v0.4.3
16-
github.com/containerd/errdefs v0.1.0
17-
github.com/containerd/nydus-snapshotter v0.13.11
18-
github.com/distribution/reference v0.5.0
19-
github.com/docker/cli v26.0.0+incompatible
10+
github.com/aws/aws-sdk-go-v2 v1.30.3
11+
github.com/aws/aws-sdk-go-v2/config v1.27.27
12+
github.com/aws/aws-sdk-go-v2/credentials v1.17.27
13+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.8
14+
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.2
15+
github.com/containerd/containerd/v2 v2.0.5
16+
github.com/containerd/continuity v0.4.5
17+
github.com/containerd/errdefs v1.0.0
18+
github.com/containerd/nydus-snapshotter v0.15.2
19+
github.com/containerd/platforms v1.0.0-rc.1
20+
github.com/distribution/reference v0.6.0
21+
github.com/docker/cli v28.1.1+incompatible
2022
github.com/dustin/go-humanize v1.0.1
21-
github.com/goharbor/acceleration-service v0.2.14
23+
github.com/goharbor/acceleration-service v0.2.18
2224
github.com/google/uuid v1.6.0
2325
github.com/hashicorp/go-hclog v1.6.2
2426
github.com/hashicorp/go-plugin v1.6.0
25-
github.com/moby/buildkit v0.13.0
27+
github.com/moby/buildkit v0.22.0
2628
github.com/opencontainers/go-digest v1.0.0
27-
github.com/opencontainers/image-spec v1.1.0
29+
github.com/opencontainers/image-spec v1.1.1
2830
github.com/pkg/errors v0.9.1
2931
github.com/pkg/xattr v0.4.9
30-
github.com/prometheus/client_golang v1.19.0
32+
github.com/prometheus/client_golang v1.22.0
3133
github.com/sirupsen/logrus v1.9.3
32-
github.com/stretchr/testify v1.9.0
33-
github.com/urfave/cli/v2 v2.27.1
34-
golang.org/x/sync v0.6.0
35-
golang.org/x/sys v0.18.0
34+
github.com/stretchr/testify v1.10.0
35+
github.com/urfave/cli/v2 v2.27.6
36+
github.com/vmihailenco/msgpack/v5 v5.4.1
37+
golang.org/x/sync v0.14.0
38+
golang.org/x/sys v0.33.0
3639
lukechampine.com/blake3 v1.2.1
3740
)
3841

3942
require (
40-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
41-
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
42-
github.com/BraveY/snapshotter-converter v0.0.5 // indirect
43-
github.com/CloudNativeAI/model-spec v0.0.2 // indirect
4443
github.com/Microsoft/go-winio v0.6.2 // indirect
45-
github.com/Microsoft/hcsshim v0.11.5 // indirect
46-
github.com/agiledragon/gomonkey/v2 v2.13.0 // indirect
47-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
48-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11 // indirect
49-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
50-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
51-
github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3 // indirect
52-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 // indirect
53-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
54-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 // indirect
55-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect
56-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 // indirect
57-
github.com/aws/aws-sdk-go-v2/service/sso v1.18.7 // indirect
58-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7 // indirect
59-
github.com/aws/aws-sdk-go-v2/service/sts v1.26.7 // indirect
60-
github.com/aws/smithy-go v1.19.0 // indirect
44+
github.com/Microsoft/hcsshim v0.13.0 // indirect
45+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
46+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.11 // indirect
47+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.15 // indirect
48+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.15 // indirect
49+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.0 // indirect
50+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.15 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.3 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.17 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.17 // indirect
54+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.15 // indirect
55+
github.com/aws/aws-sdk-go-v2/service/sso v1.22.4 // indirect
56+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
57+
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
58+
github.com/aws/smithy-go v1.20.3 // indirect
6159
github.com/beorn7/perks v1.0.1 // indirect
62-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
63-
github.com/containerd/cgroups v1.1.0 // indirect
60+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
61+
github.com/containerd/cgroups/v3 v3.0.5 // indirect
62+
github.com/containerd/containerd v1.7.23 // indirect
63+
github.com/containerd/containerd/api v1.9.0 // indirect
64+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
6465
github.com/containerd/fifo v1.1.0 // indirect
6566
github.com/containerd/log v0.1.0 // indirect
66-
github.com/containerd/stargz-snapshotter v0.15.1 // indirect
67-
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
68-
github.com/containerd/ttrpc v1.2.4 // indirect
69-
github.com/containerd/typeurl/v2 v2.1.1 // indirect
70-
github.com/containers/ocicrypt v1.1.10 // indirect
71-
github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
72-
github.com/davecgh/go-spew v1.1.1 // indirect
73-
github.com/docker/docker v25.0.6+incompatible // indirect
74-
github.com/docker/docker-credential-helpers v0.8.0 // indirect
75-
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
67+
github.com/containerd/plugin v1.0.0 // indirect
68+
github.com/containerd/stargz-snapshotter v0.16.3 // indirect
69+
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
70+
github.com/containerd/ttrpc v1.2.7 // indirect
71+
github.com/containerd/typeurl/v2 v2.2.3 // indirect
72+
github.com/containers/ocicrypt v1.2.1 // indirect
73+
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
74+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
75+
github.com/docker/docker-credential-helpers v0.9.3 // indirect
7676
github.com/fatih/color v1.16.0 // indirect
7777
github.com/felixge/httpsnoop v1.0.4 // indirect
78-
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
79-
github.com/go-logr/logr v1.4.1 // indirect
78+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
79+
github.com/go-logr/logr v1.4.2 // indirect
8080
github.com/go-logr/stdr v1.2.2 // indirect
8181
github.com/gogo/protobuf v1.3.2 // indirect
8282
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
8383
github.com/golang/protobuf v1.5.4 // indirect
84-
github.com/google/go-cmp v0.6.0 // indirect
84+
github.com/google/go-cmp v0.7.0 // indirect
8585
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
8686
github.com/hashicorp/yamux v0.1.1 // indirect
87-
github.com/jmespath/go-jmespath v0.4.0 // indirect
88-
github.com/klauspost/compress v1.17.4 // indirect
87+
github.com/klauspost/compress v1.18.0 // indirect
8988
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
9089
github.com/mattn/go-colorable v0.1.13 // indirect
9190
github.com/mattn/go-isatty v0.0.20 // indirect
9291
github.com/miekg/pkcs11 v1.1.1 // indirect
9392
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
9493
github.com/moby/locker v1.0.1 // indirect
95-
github.com/moby/sys/mountinfo v0.7.1 // indirect
96-
github.com/moby/sys/sequential v0.5.0 // indirect
97-
github.com/moby/sys/signal v0.7.0 // indirect
98-
github.com/moby/sys/user v0.1.0 // indirect
94+
github.com/moby/sys/mountinfo v0.7.2 // indirect
95+
github.com/moby/sys/sequential v0.6.0 // indirect
96+
github.com/moby/sys/signal v0.7.1 // indirect
97+
github.com/moby/sys/user v0.4.0 // indirect
98+
github.com/moby/sys/userns v0.1.0 // indirect
99+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
99100
github.com/oklog/run v1.1.0 // indirect
100-
github.com/opencontainers/runtime-spec v1.1.0 // indirect
101-
github.com/opencontainers/selinux v1.11.0 // indirect
102-
github.com/pmezard/go-difflib v1.0.0 // indirect
103-
github.com/prometheus/client_model v0.6.0 // indirect
104-
github.com/prometheus/common v0.50.0 // indirect
105-
github.com/prometheus/procfs v0.13.0 // indirect
106-
github.com/rogpeppe/go-internal v1.12.0 // indirect
101+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
102+
github.com/opencontainers/selinux v1.12.0 // indirect
103+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
104+
github.com/prometheus/client_model v0.6.1 // indirect
105+
github.com/prometheus/common v0.62.0 // indirect
106+
github.com/prometheus/procfs v0.15.1 // indirect
107107
github.com/russross/blackfriday/v2 v2.1.0 // indirect
108+
github.com/smallstep/pkcs7 v0.1.1 // indirect
108109
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 // indirect
109110
github.com/stretchr/objx v0.5.2 // indirect
110-
github.com/vbatts/tar-split v0.11.5 // indirect
111-
github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
112-
go.etcd.io/bbolt v1.3.10 // indirect
113-
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
111+
github.com/vbatts/tar-split v0.12.1 // indirect
112+
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
113+
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
114+
go.etcd.io/bbolt v1.4.0 // indirect
114115
go.opencensus.io v0.24.0 // indirect
115-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
116-
go.opentelemetry.io/otel v1.21.0 // indirect
117-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
118-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
119-
golang.org/x/crypto v0.21.0 // indirect
120-
golang.org/x/net v0.23.0 // indirect
121-
golang.org/x/term v0.18.0 // indirect
122-
golang.org/x/text v0.14.0 // indirect
123-
golang.org/x/time v0.5.0 // indirect
124-
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
125-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
126-
google.golang.org/grpc v1.62.1 // indirect
127-
google.golang.org/protobuf v1.33.0 // indirect
116+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
117+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
118+
go.opentelemetry.io/otel v1.35.0 // indirect
119+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
120+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
121+
golang.org/x/crypto v0.37.0 // indirect
122+
golang.org/x/net v0.39.0 // indirect
123+
golang.org/x/term v0.31.0 // indirect
124+
golang.org/x/text v0.24.0 // indirect
125+
golang.org/x/time v0.11.0 // indirect
126+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
127+
google.golang.org/grpc v1.72.0 // indirect
128+
google.golang.org/protobuf v1.36.6 // indirect
128129
gopkg.in/yaml.v3 v3.0.1 // indirect
129130
)
130131

131-
replace github.com/containerd/containerd => github.com/nydusaccelerator/containerd v1.7.18-nydus.10
132+
replace github.com/containerd/containerd/v2 => github.com/nydusaccelerator/containerd/v2 v2.0.0-20250528024712-b96732f49d37

0 commit comments

Comments
 (0)