This repository was 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
Merged
tiborvass merged 2 commits intodocker-archive:18.09from Oct 11, 2018
Conversation
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>
Member
Author
|
ping @dmcgowan @tiborvass PTAL |
|
LGTM |
tiborvass
approved these changes
Oct 6, 2018
|
@thaJeztah it looks like this PR did not update https://github.com/docker/docker-ce/blob/master/components/engine/hack/dockerfile/install/containerd.installer |
Member
Author
|
@mrueg correct; this PR updates the containerd client, but not the runtime itself. Note that the |
|
Thanks for the clarification! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
backport of moby#37710 for 18.09
conflicts in vendor.conf due to #60