Update vendoring to match moby/moby #2183
Conversation
|
Please sign your commits following these rules: $ git clone -b "update-vendoring" git@github.com:euanh/libnetwork.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842362453920
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -fAmending updates the existing PR. You DO NOT need to open a new one. |
|
I'll squash the vendor.conf changes before merging. I want to keep them separate until CI gives the green light. |
Codecov Report
@@ Coverage Diff @@
## master #2183 +/- ##
=========================================
Coverage ? 40.58%
=========================================
Files ? 139
Lines ? 22486
Branches ? 0
=========================================
Hits ? 9126
Misses ? 12027
Partials ? 1333
Continue to review full report at Codecov.
|
euanh
changed the title
|
LGTM |
|
I see you are touching the Dockerfile, I would like to prioritize the circle ci migration PR before this |
|
@fcrisciani I'll move the Dockerfile change into another pull request (although it's just bumping the Go micro version, so I would hope it wouldn't cause problems). It would be good to get the rest of the changes in as soon as possible, before we start to fall behind moby/moby again. |
|
@euanh can you rebase on latest master? so to have a run on the new CI infra? |
| github.com/godbus/dbus v4.0.0 | ||
| github.com/gogo/protobuf v0.4 | ||
| github.com/golang/protobuf 7a211bcf3bce0e3f1d74f9894916e6f116ae83b4 | ||
| github.com/gogo/protobuf v1.0.0 |
There was a problem hiding this comment.
I guess we should regenerate the protobuf if we update the gogo library
|
@euanh can you also bring in the script or an automated way to do this operation next time? |
|
@fcrisciani I used a bit of sed and awk to update the packages which were common between moby and libnetwork, but after that there was a bit of manual fiddling. I'm not sure it can be made fully automatic. I'm planning to make a separate pull request to add an updater. I don't want this PR to get bogged down - that's why #2028 was never merged. We need to get this one in as soon as possible - it's already falling behind. :( |
moby/moby commit b27f70d45 wraps the ErrNotFound error returned when a plugin cannot be found, to include a backtrace. This changes the type of the error, so contoller.loadDriver no longer converts it to a libnetwork plugin.NotFoundError. This causes a couple of tests which inspect the return type to fail; most code only checks whether the error is non-nil and is not affected by the change in type. Signed-off-by: Euan Harris <euan.harris@docker.com>
* Update dependencies to match moby master; add new sub-dependencies as necessary. * Update moby to latest * Update gocapability This moves gocapability beyond the version vendored in moby; presumably the code which requires this particular version is not used in moby and is removed by vndr. Moby will need to be updated as well. Signed-off-by: Euan Harris <euan.harris@docker.com>
5 participants
Update vendored dependencies to match the versions used by moby/moby
This change moves libnetwork's version of gocapability ahead of moby's, so moby will also have to be updated.
This pull request supersedes #2028