Skip to content

Commit 68365e3

Browse files
committed
Upgrade containerd to 1.5.2
Signed-off-by: Kazuyoshi Kato <[email protected]>
1 parent 7e9026a commit 68365e3

File tree

2 files changed

+790
-135
lines changed

2 files changed

+790
-135
lines changed

go.mod

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,42 @@
11
module github.com/firecracker-microvm/firecracker-containerd
22

33
require (
4-
github.com/Microsoft/go-winio v0.4.14 // indirect
54
github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 // indirect
65
github.com/awslabs/tc-redirect-tap v0.0.0-20200708224642-a0300978797d
7-
github.com/containerd/cgroups v0.0.0-20181105182409-82cb49fc1779 // indirect
8-
github.com/containerd/console v0.0.0-20191219165238-8375c3424e4d // indirect
9-
github.com/containerd/containerd v1.3.8-0.20200824223617-f99bb2cc4483
10-
github.com/containerd/continuity v0.0.0-20181027224239-bea7585dbfac // indirect
11-
github.com/containerd/fifo v0.0.0-20191213151349-ff969a566b00
12-
github.com/containerd/go-runc v0.0.0-20190226155025-7d11b49dc076
13-
github.com/containerd/ttrpc v0.0.0-20190613183316-1fb3814edf44
14-
github.com/containerd/typeurl v0.0.0-20181015155603-461401dc8f19
15-
github.com/containernetworking/cni v0.8.0
16-
github.com/containernetworking/plugins v0.8.7
17-
github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
18-
github.com/docker/distribution v2.7.1+incompatible // indirect
19-
github.com/docker/go-events v0.0.0-20170721190031-9461782956ad // indirect
20-
github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82 // indirect
6+
github.com/containerd/containerd v1.5.2
7+
github.com/containerd/fifo v1.0.0
8+
github.com/containerd/go-runc v1.0.0
9+
github.com/containerd/ttrpc v1.0.2
10+
github.com/containerd/typeurl v1.0.2
11+
github.com/containernetworking/cni v0.8.1
12+
github.com/containernetworking/plugins v0.9.1
2113
github.com/firecracker-microvm/firecracker-go-sdk v0.22.1-0.20201117001223-cd822c0d457c
2214
github.com/go-ole/go-ole v1.2.4 // indirect
23-
github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384 // indirect
2415
github.com/gofrs/uuid v3.3.0+incompatible
25-
github.com/gogo/googleapis v1.1.0 // indirect
26-
github.com/gogo/protobuf v1.3.0
27-
github.com/golang/protobuf v1.3.1
28-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
16+
github.com/gogo/protobuf v1.3.2
17+
github.com/golang/protobuf v1.4.3
2918
github.com/hashicorp/go-multierror v1.1.0
30-
github.com/imdario/mergo v0.3.8 // indirect
3119
github.com/mdlayher/vsock v0.0.0-20190329173812-a92c53d5dcab
3220
github.com/miekg/dns v1.1.16
33-
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
34-
github.com/opencontainers/image-spec v1.0.1 // indirect
35-
github.com/opencontainers/runc v1.0.0-rc9
36-
github.com/opencontainers/runtime-spec v0.1.2-0.20181106065543-31e0d16c1cb7
21+
github.com/opencontainers/runc v1.0.0-rc93
22+
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d
3723
github.com/pkg/errors v0.9.1
38-
github.com/prometheus/client_golang v0.9.2 // indirect
3924
github.com/shirou/gopsutil v2.18.12+incompatible
4025
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
4126
github.com/sirupsen/logrus v1.7.0
4227
github.com/stretchr/testify v1.6.1
43-
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 // indirect
44-
github.com/urfave/cli v1.20.0 // indirect
45-
github.com/vishvananda/netlink v1.1.0
46-
go.etcd.io/bbolt v1.3.1-etcd.8 // indirect
47-
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
48-
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd
49-
google.golang.org/genproto v0.0.0-20181109154231-b5d43981345b // indirect
50-
google.golang.org/grpc v1.21.0
51-
gotest.tools v2.2.0+incompatible // indirect
28+
github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
29+
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
30+
golang.org/x/sys v0.0.0-20210324051608-47abb6519492
31+
google.golang.org/grpc v1.34.0
5232
)
5333

54-
// Workaround for github.com/containerd/containerd issue #3031
55-
replace github.com/docker/distribution v2.7.1+incompatible => github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
34+
replace (
35+
// Pin gPRC-related dependencies as like containerd v1.5.1
36+
github.com/gogo/googleapis => github.com/gogo/googleapis v1.3.2
37+
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
38+
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
39+
google.golang.org/grpc => google.golang.org/grpc v1.27.1
40+
)
5641

5742
go 1.11

0 commit comments

Comments
 (0)