Skip to content

Update libnetwork version for IPv6 support#28562

Merged
mavenugo merged 3 commits intomoby:masterfrom
tomdee:bump-libnetwork
Nov 21, 2016
Merged

Update libnetwork version for IPv6 support#28562
mavenugo merged 3 commits intomoby:masterfrom
tomdee:bump-libnetwork

Conversation

@tomdee
Copy link
Contributor

@tomdee tomdee commented Nov 17, 2016

Fixes #28055
Also fixes two bugs which would cause a panic in sandbox.go and osl/neigh_linux.go

@aboch
Copy link
Contributor

aboch commented Nov 18, 2016

@docker/tools-team
Regarding the test failure

00:47:37 FAIL: docker_cli_network_unix_test.go:714: DockerNetworkSuite.TestDockerNetworkInspectCustomSpecified
00:47:37
00:47:37 docker_cli_network_unix_test.go:715:
00:47:37 dockerCmd(c, "network", "create", "--driver=bridge", "--ipv6", "--subnet=172.28.0.0/16", "--ip-range=172.28.5.0/24", "--gateway=172.28.5.254", "br0")

simply add and IPv6 --subnet to the command.

@aboch
Copy link
Contributor

aboch commented Nov 18, 2016

@tomdee
Since you need to update your PR, please vendor libnetwork up to moby/libnetwork@f36e733

Thanks!

@tomdee
Copy link
Contributor Author

tomdee commented Nov 18, 2016

@aboch Can this be added to the v1.13 milestone?

@cpuguy83 cpuguy83 added this to the 1.13.0 milestone Nov 18, 2016
@mavenugo
Copy link
Contributor

@tomdee pls update the vendoring to moby/libnetwork@f36e733 so that we can easily cherry-pick this PR into the 1.3 branch.

@tomdee
Copy link
Contributor Author

tomdee commented Nov 18, 2016

@mavenugo @aboch I tried to update to the moby/libnetwork@f36e733 but got the following

# github.com/docker/docker/vendor/github.com/docker/libnetwork/ns
vendor/github.com/docker/libnetwork/ns/init_linux.go:36: initNl.SetSocketTimeout undefined (type *netlink.Handle has no field or method SetSocketTimeout)

I suggest you update the vendoring for that in a follow on PR

@aboch
Copy link
Contributor

aboch commented Nov 18, 2016

@tomdee Ah yes, we also need to vendor latest netlink

@tomdee
Copy link
Contributor Author

tomdee commented Nov 18, 2016

I've updated the test and it's passing locally.

@tomdee
Copy link
Contributor Author

tomdee commented Nov 20, 2016

@aboch @mavenugo Pushed with netlink and libnetwork vendors. And the tests are updated.

I'd love to see this merged and cherry picked in 1.13 ASAP, but I'm on vacation until after thanksgiving so can one you handle that?

Copy link
Member

Choose a reason for hiding this comment

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

Indent seems wrong here

@aboch
Copy link
Contributor

aboch commented Nov 20, 2016

Thanks @tomdee
changes look good to me

Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐸

@mavenugo
Copy link
Contributor

LGTM

@mavenugo mavenugo merged commit 111a95f into moby:master Nov 21, 2016
@mavenugo
Copy link
Contributor

@sanimej @aboch we have to vendor in libnetwork to the latest and then cherry-pick into 1.13.0 bump branch. can u please take care of that ?

@aboch
Copy link
Contributor

aboch commented Nov 23, 2016

Also fixes #25184

Sign up for free to 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.

The --ipv6 flag to docker network create is broken for remote plugins in Docker 1.12.2

7 participants