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 #106

Conversation

thaJeztah
Copy link
Member

backport of moby#38145 for 18.09

also included (to get a clean cherry-pick);

git checkout -b 18.09_backport_bump_containerd_client_only_v1.2.0

// https://github.com/moby/moby/pull/37999
git cherry-pick -s -S -x bde99960657818efabf313991867c42921882275
git cherry-pick -s -S -x d03ab106624ebc30b69080d0092702ad1fe1285c

// https://github.com/moby/moby/pull/38048
git cherry-pick -s -S -x 275044bbc374b563a2039229660df58a75bdc9f3

// https://github.com/moby/moby/pull/38145
git cherry-pick -s -S -x dd7799afd40b74e538af01fc658c861d225a4b82
git push -u origin

John Howard and others added 4 commits November 6, 2018 11:03
Signed-off-by: John Howard <[email protected]>

This removes the need for an SVM in the LCOW driver to ApplyDiff.

This change relates to a fix for moby#36353

However, it found another issue, tracked by moby#37955

(cherry picked from commit bde9996)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: John Howard <[email protected]>
(cherry picked from commit d03ab10)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Changes: opencontainers/runc@69663f0...a00bf01

Signed-off-by: Akihiro Suda <[email protected]>
(cherry picked from commit 275044b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit dd7799a)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 18.09.0 milestone Nov 6, 2018
@thaJeztah
Copy link
Member Author

@mrueg that's being worked on separately; see moby#38062 / moby#37932

@thaJeztah thaJeztah modified the milestones: 18.09.0, 18.09.1 Nov 8, 2018
@andrewhsu andrewhsu merged commit c270942 into docker-archive:18.09 Nov 27, 2018
@thaJeztah thaJeztah deleted the 18.09_backport_bump_containerd_client_only_v1.2.0 branch November 27, 2018 17:16
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