Skip to content

Reformat vendor.conf, update docker/docker and dependencies#2361

Merged
euanh merged 3 commits intomoby:masterfrom
thaJeztah:bump_engine
Jun 24, 2019
Merged

Reformat vendor.conf, update docker/docker and dependencies#2361
euanh merged 3 commits intomoby:masterfrom
thaJeztah:bump_engine

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

This updates docker/docker and its dependencies to what's currently the tip of the 19.03 branch.

Also reformats vendor.conf for readability; inspired by the formatting used in the Notary repository 😅

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>
@thaJeztah
Copy link
Copy Markdown
Member Author

ping @mavenugo @selansen @euanh PTAL

I realise this is a big diff; these are the versions of the dependencies that the libnetwork code is running on when vendored in moby/moby, so it's good to use the same versions here

Copy link
Copy Markdown
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

SGTM, @mavenugo this would be helpful for syncing up the vendor of go code so backports can go in more smoothly

@thaJeztah
Copy link
Copy Markdown
Member Author

It's mainly to make sure that we're testing against the same version of the dependencies as we'll be using the libnetwork code in (when vendoring it into moby/moby).

Note that none of the vendored files are used in "production" (as we strip the vendor directory when vendoring libnetwork into moby)

Copy link
Copy Markdown
Contributor

@selansen selansen left a comment

Choose a reason for hiding this comment

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

LGTM

@arkodg
Copy link
Copy Markdown
Contributor

arkodg commented Jun 21, 2019

@euanh PTAL

@euanh euanh merged commit 3cfe8c7 into moby:master Jun 24, 2019
@thaJeztah thaJeztah deleted the bump_engine branch June 24, 2019 09:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants