Skip to content

Commit

Permalink
vendor containerd (required for rootless overlayfs on kernel 5.11)
Browse files Browse the repository at this point in the history 
Vendor https://github.com/AkihiroSuda/containerd/commits/buildkit/v0.8/20210311 .

This revision is forked from containerd/containerd@0edc412 (20201117)
with `overlay: support "userxattr" option (kernel 5.11)` (containerd/containerd#5076)

Relates to moby#2013

Signed-off-by: Akihiro Suda <[email protected]>
  • Loading branch information
@AkihiroSuda
AkihiroSuda committed Mar 11, 2021
1 parent 9065b18 commit 8d7110d
Show file tree
Hide file tree
Showing 5 changed files with 102 additions and 66 deletions.
4 changes: 4 additions & 0 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/Microsoft/hcsshim v0.8.10
github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58 // indirect
github.com/containerd/console v1.0.1
// containerd: the actual version is replaced in replace()
github.com/containerd/containerd v1.4.1-0.20201117152358-0edc412565dc
github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe
github.com/containerd/go-cni v1.0.1
Expand Down Expand Up @@ -71,6 +72,9 @@ require (
)

replace (
// containerd: Forked from containerd/containerd@0edc412565dcc6e3d6125ff9e4b009ad4b89c638 (20201117),
// with `overlay: support "userxattr" option (kernel 5.11)` (containerd/containerd#5076)
github.com/containerd/containerd => github.com/AkihiroSuda/containerd v1.1.1-0.20210311045611-4e5d7fefb0d8
// protobuf: corresponds to containerd
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
github.com/hashicorp/go-immutable-radix => github.com/tonistiigi/go-immutable-radix v0.0.0-20170803185627-826af9ccf0fe
Expand Down
Loading

0 comments on commit 8d7110d

Please sign in to comment.