Skip to content

Update docker, swarmkit, containerd v1.2.2 - #1655

Merged
vdemeester merged 3 commits into
docker:masterfrom
thaJeztah:bump_engine
Feb 6, 2019
Merged

Update docker, swarmkit, containerd v1.2.2#1655
vdemeester merged 3 commits into
docker:masterfrom
thaJeztah:bump_engine

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Feb 2, 2019

Copy link
Copy Markdown
Member

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):

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah

Copy link
Copy Markdown
MemberAuthor

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

Hm.. tests are failing due to the addition of a Builder field;

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

Copy link
Copy Markdown
MemberAuthor

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/);

The API uses an open schema model, which means server may add extra properties to responses. Likewise, the server will ignore any extra query parameters and request body properties. When you write clients, you need to ignore additional properties in responses to ensure they do not break when talking to newer daemons.

@codecov-io

Copy link
Copy Markdown

Codecov Report

Merging #1655 into master will not change coverage.
The diff coverage is n/a.

@@ 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-lubeckisilvin-lubecki left a comment

Copy link
Copy Markdown
Contributor

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-lubeckisilvin-lubecki left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@vdemeestervdemeester left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐯

@vdemeester
vdemeester merged commit 8ef8df8 into docker:masterFeb 6, 2019
@GordonTheTurtleGordonTheTurtle added this to the 19.03.0 milestone Feb 6, 2019
@thaJeztah
thaJeztah deleted the bump_engine branch February 6, 2019 17:47
@kolyshkin

Copy link
Copy Markdown
Contributor

This should fix docker/for-linux#484 as it includes vendoring docker/docker to a version that contains moby/moby#38634

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@thaJeztah@codecov-io@kolyshkin@vdemeester@silvin-lubecki@GordonTheTurtle