Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] backport update containerd client and dependencies to v1.2.0-rc.1 #75

Conversation

thaJeztah
Copy link
Member

backport of moby#37710 for 18.09

git checkout -b 18.09_backport_bump_containerd_client_1.2.0_rc.1 ce-engine/18.09
git cherry-pick -s -S -x 31a9c9e79101cdf38d383104afbc1b48ede75291
git cherry-pick -s -S -x dd622c81a4ea8f4e625f03ee9f13ad47b8746638

conflicts in vendor.conf due to #60

This updates the containerd dependencies to match
the versions used by the vendored containerd version

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 31a9c9e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dd622c8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.09.0 milestone Oct 5, 2018
@thaJeztah
Copy link
Member Author

ping @dmcgowan @tiborvass PTAL

@dmcgowan
Copy link

dmcgowan commented Oct 5, 2018

LGTM

@tiborvass tiborvass merged commit 8e67dfa into docker-archive:18.09 Oct 11, 2018
@thaJeztah thaJeztah deleted the 18.09_backport_bump_containerd_client_1.2.0_rc.1 branch October 11, 2018 20:36
@mrueg
Copy link

mrueg commented Nov 8, 2018

@thaJeztah
Copy link
Member Author

@mrueg correct; this PR updates the containerd client, but not the runtime itself. Note that the containerd.installer only affects the static binaries; the rpm and deb packages use a separate package for containerd (which may have a different version)

@mrueg
Copy link

mrueg commented Nov 8, 2018

Thanks for the clarification!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants