Uh oh!
There was an error while loading. Please reload this page.
Update docker, swarmkit, containerd v1.2.2 - #1655
Conversation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
commented
Feb 2, 2019
ping @silvin-lubecki@tiborvass@vdemeester PTAL |
thaJeztah
commented
Feb 2, 2019
Hm.. tests are failing due to the addition of a diff --git a/scratch_4.json b/scratch_5.json
index 643f991..13ffd36 100644
--- a/scratch_4.json+++ b/scratch_5.json@@ -1,5 +1,6 @@
{
"ID": "EKHL:QDUU:QZ7U:MKGD:VDXK:S27Q:GIPU:24B7:R7VT:DGN6:QCSF:2UBX",
+ "Builder": "",
"Containers": 0,
"ContainersRunning": 0,
"ContainersPaused": 0, |
Also update the tests to account for the new "Builder" field in docker info. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
commented
Feb 2, 2019
Updated the tests, but we may want to look for a different implementation; API clients should ignore unknown fields (see https://docs.docker.com/engine/api/v1.39/);
|
codecov-io
commented
Feb 2, 2019
Codecov Report
@@ Coverage Diff @@## master #1655 +/- ##
=======================================
Coverage 56.11% 56.11% =======================================
Files 306 306 Lines 20909 20909 =======================================
Hits 11734 11734 Misses 8328 8328 Partials 847 847 |
silvin-lubecki
left a comment
There was a problem hiding this comment.
LGTM, but requesting changes to prevent merging before #1561
kolyshkin
commented
Mar 4, 2019
This should fix docker/for-linux#484 as it includes vendoring docker/docker to a version that contains moby/moby#38634 |
Built on top of #1561. The update to containerd 1.2.2 did not bring in new changes.
This gets rid of the (forked) github.com/Nvveen/Gotty dependency (which is now replaced with github.com/morikuni/aec, that was already in used in the cli)
Full diffs (excluding changes from #1561):