Skip to content

Bump engine, containerd, and buildkit to match upstream - #1393

Merged
silvin-lubecki merged 6 commits into
docker:masterfrom
thaJeztah:update_docker_buildkit_containerd
Sep 26, 2018
Merged

Bump engine, containerd, and buildkit to match upstream#1393
silvin-lubecki merged 6 commits into
docker:masterfrom
thaJeztah:update_docker_buildkit_containerd

Conversation

@thaJeztah

@thaJeztahthaJeztah commented Sep 26, 2018

Copy link
Copy Markdown
Member

This one is gonna conflict with #1385, which also bumps containerd, so I'll rebase once that's merged.

Update docker/docker to 9f296d1e6fccd9f73bae345e4aad4f3f6e92fdeb

full diff: moby/moby@53e55db...9f296d1

Possibly relevant changes:

Bump Microsoft/hcsshim to v0.7.3, Microsoft/go-winio to v0.4.11

Full diffs:

Bump containerd to d97a907f7f781c0ab8340877d8e6b53cc7f1c2f6

Bump etcd dependencies

etcd was updated to v3.3.9 in (#1230), but dependencies were not bumped. This bumps dependencies to the same versions as was done upstream in moby/moby moby/moby#37805

Bump buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5

Bump swarmkit to 9f271c2963d18a7c60d2c4001fb418ca4037df19

@thaJeztah

Copy link
Copy Markdown
MemberAuthor

@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.

SGTM 🐯

@thaJeztahthaJeztah changed the title Bump engine, containerd, and buildkit to match upstream[WIP] Bump engine, containerd, and buildkit to match upstreamSep 26, 2018
@thaJeztah

Copy link
Copy Markdown
MemberAuthor

made it "WIP", as it's probably best to merge the other PR first 😅

@codecov-io

codecov-io commented Sep 26, 2018

Copy link
Copy Markdown

Codecov Report

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

@@ Coverage Diff @@## master #1393 +/- ##
======================================
Coverage 54.4% 54.4% ======================================
Files 289 289 Lines 19266 19266 ======================================
Hits 10481 10481 Misses 8113 8113 Partials 672 672

@thaJeztah
thaJeztahforce-pushed the update_docker_buildkit_containerd branch from e726952 to a01fbe3CompareSeptember 26, 2018 13:41
@thaJeztahthaJeztah changed the title [WIP] Bump engine, containerd, and buildkit to match upstreamBump engine, containerd, and buildkit to match upstreamSep 26, 2018
…fdeb
Relevant changes:
- moby#37701 Add support for sysctl options in services
- moby#37780 pkg/progress: work around closing closed channel panic
- moby#37829 Update copyright years
- moby#37770 Windows: Go1.11: Use long path in TestBuildSymlinkBreakout
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
etcd was updated to v3.3.9 in 8788a48, but
dependencies were not bumped. This bumps dependencies to the same versions as
was done upstream in moby/moby
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…7afe5
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
thaJeztahforce-pushed the update_docker_buildkit_containerd branch from a01fbe3 to 1833bc5CompareSeptember 26, 2018 13:46

@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

@silvin-lubecki
silvin-lubecki merged commit 939fa90 into docker:masterSep 26, 2018
@GordonTheTurtleGordonTheTurtle added this to the 19.03.0 milestone Sep 26, 2018
@thaJeztah
thaJeztah deleted the update_docker_buildkit_containerd branch September 26, 2018 13:55
lifubang pushed a commit to lifubang/cli that referenced this pull request Sep 29, 2018
…containerd
Bump engine, containerd, and buildkit to match upstream
Signed-off-by: Lifubang <lifubang@acmcoder.com>
saeidfrj33

This comment was marked as spam.

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@vdemeester@silvin-lubecki@saeidfrj33@GordonTheTurtle