-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Update docker, swarmkit, containerd v1.2.2 #1655
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
|
ping @silvin-lubecki @tiborvass @vdemeester PTAL |
|
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>
03f6e63 to
d034df7
Compare
|
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 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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, but requesting changes to prevent merging before #1561
silvin-lubecki
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
vdemeester
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 🐯
|
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):