Skip to content

bump docker/docker to master and unfork dependencies - #1975

Merged
mavenugo merged 1 commit into
moby:masterfrom
thaJeztah:unfork-docker
Oct 25, 2017
Merged

mavenugo merged 1 commit into
moby:masterfrom
thaJeztah:unfork-docker

Conversation

@thaJeztah

Copy link
Copy Markdown
Member

This patch updates all dependencies to match what is used in moby/moby. Making the dependencies match what is used in that repository makes sure we test with the same version as libnetwork is later built with in moby.

This also gets rid of some temporary forks that were needed during the migration of Sirupsen/logrus to sirupsen/logrus.

ping @fcrisciani @abhi LMK if you think this is a good thing to do; I started this to just get rid of the forks, but noticed the version of the dependencies used here were very outdated, compared with what's used in Docker, so decided to try and bump those to what's currently used there.

@thaJeztah

Copy link
Copy Markdown
Member Author

Looks like some changes are needed in the dnet tool that's used in the tests;

go build -o "bin/dnet-$GOOS-$GOARCH" ./cmd/dnet
# github.com/docker/libnetwork/cmd/dnet
cmd/dnet/dnet_windows.go:20: undefined: system.CreateEvent
Makefile:60: recipe for target 'cross-local' failed
make: *** [cross-local] Error 2
make: *** [circle-ci-cross] Error 2

@thaJeztah

Copy link
Copy Markdown
Member Author

I'll need to make the same modifications as are made here; moby/moby@e942513#diff-e1546f0e7fe0b238191ff0cb82342936

@thaJeztah

Copy link
Copy Markdown
Member Author

Updated, all green now 👍

@codecov-io

codecov-io commented Oct 8, 2017 •

Copy link
Copy Markdown

Codecov Report

❗ No coverage uploaded for pull request base (master@2bad0e8). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #1975   +/-   ##
=========================================
  Coverage          ?   38.04%           
=========================================
  Files             ?      137           
  Lines             ?    27362           
  Branches          ?        0           
=========================================
  Hits              ?    10411           
  Misses            ?    15681           
  Partials          ?     1270

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2bad0e8...873af34. Read the comment docs.

@fcrisciani

Copy link
Copy Markdown

Fixes: #1899

@fcrisciani

Copy link
Copy Markdown

LGTM, but I would like also @mavenugo to take a look

This patch updates all dependencies to match what is
used in moby/moby. Making the dependencies match
what is used in that repository makes sure we test
with the same version as libnetwork is later built
with in moby.

This also gets rid of some temporary forks that were
needed during the migration of Sirupsen/logrus to
sirupsen/logrus.

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

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

@mavenugo

Copy link
Copy Markdown
Contributor

For this change, If CI is happy, am happy :)

@mavenugo
mavenugo merged commit dd20549 into moby:master Oct 25, 2017
@thaJeztah

Copy link
Copy Markdown
Member Author

Thanks!

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.

4 participants