Skip to content

vendor: update containerd to 1.3.0-beta#1107

Merged
tiborvass merged 8 commits intomoby:masterfrom
tonistiigi:containerd-update
Aug 21, 2019
Merged

vendor: update containerd to 1.3.0-beta#1107
tiborvass merged 8 commits intomoby:masterfrom
tonistiigi:containerd-update

Conversation

@tonistiigi
Copy link
Copy Markdown
Member

@tonistiigi tonistiigi commented Aug 1, 2019 •
edited
Loading

@tonistiigi tonistiigi marked this pull request as ready for review August 2, 2019 18:13
@tonistiigi tonistiigi mentioned this pull request Aug 2, 2019
Closed
@tonistiigi tonistiigi force-pushed the containerd-update branch 3 times, most recently from f72916a to cff3c82 Compare August 5, 2019 23:37
@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Aug 9, 2019

@tonistiigi needs a rebase

@thaJeztah thaJeztah mentioned this pull request Aug 9, 2019
Merged
thaJeztah
thaJeztah reviewed Aug 9, 2019
View reviewed changes
go.mod Outdated
github.com/opencontainers/go-digest v1.0.0-rc1
github.com/opencontainers/image-spec v1.0.1
github.com/opencontainers/runc v1.0.0-rc8
github.com/opencontainers/runc v1.0.0-rc6
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Aug 9, 2019

Choose a reason for hiding this comment

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

Why did this roll back to an older runc version? Is it because it no longer uses a version that matches a tag? https://github.com/containerd/containerd/blob/v1.3.0-beta.1/vendor.conf#L23

Copy link
Copy Markdown
Member Author

@tonistiigi tonistiigi Aug 14, 2019

Choose a reason for hiding this comment

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

It is the go.mod sorting that does this. Need to make up prefixes again.

dmcgowan
dmcgowan approved these changes Aug 20, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

thaJeztah
thaJeztah reviewed Aug 20, 2019
View reviewed changes
go.mod
github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601 // indirect
github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50
github.com/containerd/containerd v1.3.0-0.20190507210959-7c1e88399ec0
github.com/containerd/containerd v1.3.0-beta.0.0.20190802175917-f0821348b4a8
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Aug 20, 2019

Choose a reason for hiding this comment

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

This was tagged now as v1.3.0-beta.1 https://github.com/containerd/containerd/releases/tag/v1.3.0-beta.1

Copy link
Copy Markdown
Member Author

@tonistiigi tonistiigi Aug 20, 2019

Choose a reason for hiding this comment

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

beta.1 is f06e605f1aef6150b5b4d4556e5b84eeb758fb51

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah Aug 20, 2019

Choose a reason for hiding this comment

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

ah, hm, my bad guess I copied the wrong one; any reason not to update to beta.1 ? containerd/containerd@f082134...f06e605

@thaJeztah thaJeztah changed the title vendor: update containerd to 1.3.0-beta.0 vendor: update containerd to 1.3.0-beta.1 Aug 20, 2019
@tonistiigi tonistiigi changed the title vendor: update containerd to 1.3.0-beta.1 vendor: update containerd to 1.3.0-beta Aug 20, 2019
tiborvass
tiborvass reviewed Aug 20, 2019
View reviewed changes
vendor/github.com/containerd/containerd/namespaces_opts_linux.go
import (
"context"

"github.com/containerd/cgroups"
Copy link
Copy Markdown
Collaborator

@tiborvass tiborvass Aug 20, 2019

Choose a reason for hiding this comment

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

For the record, just by removing this dependency, we could remove 17047 lines of vendoring.

Copy link
Copy Markdown
Collaborator

@tiborvass tiborvass Aug 20, 2019

Choose a reason for hiding this comment

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

I opened containerd/containerd#3564

@tiborvass tiborvass mentioned this pull request Aug 20, 2019
Merged
AkihiroSuda
AkihiroSuda approved these changes Aug 20, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

lgtm after rebase

tonistiigi and others added 6 commits August 20, 2019 17:00
@tonistiigi
vendor: update containerd to 1.3.0-beta.0
6153472 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi
update containerd daemon to 1.2.7 and old to 1.1.7
b407790 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi
util: remove unused dockerexporter package
be3635e 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi
util: check for localhost for plainhttp
e863748 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi
vendor: update containerd to f0821348
5d617c5 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@crosbymichael @tonistiigi
Pin containerd runtime to v1
9290c15 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
@tonistiigi
client: update tests to new deps
ac8fd77 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi
hack: enabled progressflag for ci_first_pass
a859c9d 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tiborvass tiborvass merged commit 458661a into moby:master Aug 21, 2019
@tonistiigi tonistiigi mentioned this pull request Sep 11, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah left review comments

@tiborvass tiborvass tiborvass approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

+1 more reviewer

@dmcgowan dmcgowan dmcgowan approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@tonistiigi @thaJeztah @dmcgowan @tiborvass @AkihiroSuda @crosbymichael