Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vendor: update containerd (and various packages) #1379

Merged
merged 1 commit into from
Feb 28, 2020
Merged

vendor: update containerd (and various packages) #1379

merged 1 commit into from
Feb 28, 2020

Conversation

AkihiroSuda
Copy link
Member

@AkihiroSuda AkihiroSuda commented Feb 25, 2020 •
edited
Loading

protobuf stuffs are updated as well. (caused by go mod tidy)

AkihiroSuda
AkihiroSuda commented Feb 25, 2020
View reviewed changes
go.mod
github.com/containerd/containerd v1.4.0-0.20191014053712-acdcf13d5eaf
github.com/containerd/cgroups v0.0.0-20200217135630-d732e370d46d // indirect
github.com/containerd/console v0.0.0-20191219165238-8375c3424e4d
github.com/containerd/containerd v1.4.0-0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from #1376 (comment)

@AkihiroSuda
Copy link
Member Author

Some protobuf hell

#21 20.34 frontend/gateway/pb/gateway.pb.go:2102:24: m.Error.MarshalToSizedBuffer undefined (type *rpc.Status has no field or method MarshalToSizedBuffer)
#21 20.34 frontend/gateway/pb/gateway.pb.go:2784:34: m.Entries[iNdEx].MarshalToSizedBuffer undefined (type *"github.com/tonistiigi/fsutil/types".Stat has no field or method MarshalToSizedBuffer)
#21 20.34 frontend/gateway/pb/gateway.pb.go:2865:23: m.Stat.MarshalToSizedBuffer undefined (type *"github.com/tonistiigi/fsutil/types".Stat has no field or method MarshalToSizedBuffer)
#21 ...

This was referenced Feb 25, 2020
Closed
Merged
AkihiroSuda
AkihiroSuda commented Feb 25, 2020
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@tonistiigi
Copy link
Member 

#40 73.26 # github.com/docker/docker/pkg/system
#40 73.26 vendor/github.com/docker/docker/pkg/system/filesys_windows.go:113:24: cannot use uintptr(unsafe.Pointer(&sd[0])) (type uintptr) as type *"golang.org/x/sys/windows".SECURITY_DESCRIPTOR in assignment

@AkihiroSuda AkihiroSuda force-pushed the update-containerd-20200225 branch 2 times, most recently from 2fc2648 to 4b71ae9 Compare February 26, 2020 01:14
@AkihiroSuda
Copy link
Member Author

green

@tonistiigi
Copy link
Member

should we wait for containerd/containerd#4053 ?

@AkihiroSuda
Copy link
Member Author

not necessary, I think

@tonistiigi
Copy link
Member

@AkihiroSuda containerd/containerd#4053 was merged so please update for safety. Also probably good idea to go over moby deps so there aren't big surprises when vendoring buildkit next time.

@AkihiroSuda
vendor: update containerd (and various packages)
7b579cd 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda AkihiroSuda changed the title vendor: update containerd vendor: update containerd (and various packages) Feb 28, 2020
@AkihiroSuda
Copy link
Member Author

updated

Also probably good idea to go over moby deps so there aren't big surprises when vendoring buildkit next time.

Sure, that is one of the purposes of this PR.

@tonistiigi tonistiigi merged commit 4d8d91b into moby:master Feb 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@AkihiroSuda @tonistiigi