Skip to content

Update containerd to 1.2.1#1561

Merged
silvin-lubecki merged 2 commits intodocker:masterfrom
thaJeztah:bump_containerd_v1.2.1
Feb 6, 2019
Merged

Update containerd to 1.2.1#1561
silvin-lubecki merged 2 commits intodocker:masterfrom
thaJeztah:bump_containerd_v1.2.1

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Dec 11, 2018

No description provided.

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Dec 11, 2018

doh. looks like a test needs updating

?   	github.com/docker/cli/docs/yaml	[no test files]
# github.com/docker/cli/internal/containerizedengine [github.com/docker/cli/internal/containerizedengine.test]
internal/containerizedengine/update_test.go:80:4: cannot use image (type *fakeImage) as type containerd.Image in return argument:
	*fakeImage does not implement containerd.Image (missing Labels method)
internal/containerizedengine/update_test.go:95:5: cannot use image (type *fakeImage) as type containerd.Image in return argument:
	*fakeImage does not implement containerd.Image (missing Labels method)
internal/containerizedengine/update_test.go:127:4: cannot use image (type *fakeImage) as type containerd.Image in return argument:
	*fakeImage does not implement containerd.Image (missing Labels method)
internal/containerizedengine/update_test.go:252:4: cannot use image (type *fakeImage) as type containerd.Image in return argument:
	*fakeImage does not implement containerd.Image (missing Labels method)
FAIL	github.com/docker/cli/internal/containerizedengine [build failed]
make: *** [Makefile:22: test-coverage] Error 2
Exited with code 2

@thaJeztah thaJeztah force-pushed the bump_containerd_v1.2.1 branch from bd8df20 to 7bb2ab8 Compare December 11, 2018 09:31
@thaJeztah thaJeztah force-pushed the bump_containerd_v1.2.1 branch from 7bb2ab8 to 3f99b4a Compare December 11, 2018 11:36
@codecov-io
Copy link
Copy Markdown

codecov-io commented Dec 11, 2018 •
edited
Loading

Codecov Report

Merging #1561 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1561   +/-   ##
=======================================
  Coverage   56.11%   56.11%           
=======================================
  Files         306      306           
  Lines       20909    20909           
=======================================
  Hits        11734    11734           
  Misses       8328     8328           
  Partials      847      847

thaJeztah
thaJeztah commented Dec 11, 2018
View reviewed changes
vendor.conf
github.com/containerd/continuity f44b615e492bdfb371aae2f76ec694d9da1db537
github.com/containerd/fifo 3d5202a
github.com/containerd/typeurl f694355
github.com/containerd/cri 0ca1e3c2b73b5c38e72f29bb76338d0078b23d6c # release/1.2 branch
Copy link
Copy Markdown
Member Author

@thaJeztah thaJeztah Dec 11, 2018

Choose a reason for hiding this comment

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

We can get rid of this dependency once distribution/distribution#2786 is accepted (and containerd/containerd and containerd/cri are updated accordingly)

Copy link
Copy Markdown
Contributor

@silvin-lubecki silvin-lubecki Feb 6, 2019

Choose a reason for hiding this comment

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

Are containerd/containerd and containerd/cri updated? Is this comment still valid?

Copy link
Copy Markdown
Member Author

@thaJeztah thaJeztah Feb 6, 2019

Choose a reason for hiding this comment

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

The PR was merged in docker/distribution, but it'll take some time before it to get into containerd/cri and a containerd release

Copy link
Copy Markdown
Contributor

@silvin-lubecki silvin-lubecki Feb 6, 2019

Choose a reason for hiding this comment

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

Ok so I guess in a followup then 👍

@thaJeztah thaJeztah mentioned this pull request Jan 4, 2019
Merged
@thaJeztah thaJeztah force-pushed the bump_containerd_v1.2.1 branch from a0e91d5 to cecdf88 Compare January 4, 2019 15:08
vdemeester
vdemeester approved these changes Jan 4, 2019
View reviewed changes
Copy link
Copy Markdown
Collaborator

@vdemeester vdemeester 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
Copy link
Copy Markdown
Member Author

thaJeztah commented Jan 4, 2019

ping @silvin-lubecki ptal

@thaJeztah
Update containerd to 1.2.1
f353eeb 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Update github.com/containerd/continuity
7df6bb5 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the bump_containerd_v1.2.1 branch from cecdf88 to 7df6bb5 Compare February 2, 2019 12:32
@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Feb 2, 2019

rebased @silvin-lubecki @tiborvass PTAL

@thaJeztah thaJeztah mentioned this pull request Feb 2, 2019
Merged
@silvin-lubecki silvin-lubecki merged commit 7e0a966 into docker:master Feb 6, 2019
@thaJeztah thaJeztah deleted the bump_containerd_v1.2.1 branch February 6, 2019 17:46
This was referenced Feb 7, 2019
Merged
Merged
@thaJeztah thaJeztah added this to the 19.03.0 milestone Feb 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vdemeester vdemeester vdemeester approved these changes

@dhiltgen dhiltgen Awaiting requested review from dhiltgen

@andrewhsu andrewhsu Awaiting requested review from andrewhsu

@silvin-lubecki silvin-lubecki Awaiting requested review from silvin-lubecki

Assignees

No one assigned

Labels

status/2-code-review

Projects

None yet

Milestone

19.03.0

Development

Successfully merging this pull request may close these issues.

5 participants

@thaJeztah @codecov-io @vdemeester @silvin-lubecki @GordonTheTurtle