[17.10] re-vndr libnetwork to 6c51292 and swarmkit to 872861d

[andrewhsu]

Re-vndr and cherry-pick a commit moby/moby@7e6b216 (cherry-pick went in clean) to update the DockerSwarmSuite.TestSwarmNetworkIPAMOptions test:

$ cd components/engine
$ vi vendor.conf
$ make BIND_DIR=. shell
$ vndr github.com/docker/libnetwork
$ vndr github.com/docker/swarmkit
$ exit
$ cd ../..
$ git cherry-pick -s -x -Xsubtree=components/engine 7e6b216

Brings in the following libnetwork changes:

• Serializing bitseq alloc moby/libnetwork#1788 Serializing bitseq alloc
• Overlay fix for transient IP reuse moby/libnetwork#1935 Overlay fix for transient IP reuse
• NetworkDB create NodeID for cluster nodes moby/libnetwork#1936 NetworkDB create NodeID for cluster nodes
• Repair (*Broadcaster).run goroutine leak  moby/libnetwork#1958 Repair (*Broadcaster).run goroutine leak
• Fix comparison against wrong constant moby/libnetwork#1960 Fix comparison against wrong constant
• Fix IPMask marshalling moby/libnetwork#1968 Fix IPMask marshalling
• Fix typo in overlay log message moby/libnetwork#1973 Fix typo in overlay log message
• Disable hostname lookup on chain exists check moby/libnetwork#1974 Disable hostname lookup on chain exists check

Comparison of changes in libnetwork upstream: moby/libnetwork@0f08d31...6c51292

Brings in the following swarmkit changes:

• Adding ipam options to ipam driver requests moby/swarmkit#2324 Adding ipam options to ipam driver requests
• More comments and logging fixes. moby/swarmkit#2362 More comments and logging fixes.
• More logging for raft/processInternalRaftRequest moby/swarmkit#2389 More logging for raft/processInternalRaftRequest

Comparison of changes in swarmkit upstream: moby/swarmkit@941a018...872861d

[fcrisciani]

I think there is a compilation error due to something in swarmkit missing...

00:28:37 [init] vendor/github.com/docker/swarmkit/manager/allocator/cnmallocator/portallocator.go:385: not enough arguments in call to ps.dynamicPortSpace.GetID
00:28:37 [init] 	have ()
00:28:37 [init] 	want (bool)
00:28:54 [init] Makefile-docker-ce:45: recipe for target 'binary-daemon' failed

@abhi is the bitseq change?

[vieux]

looks like moby/libnetwork@a2bcac0 is missing

[andrewhsu]

@vieux i think the original failure in compilation was because i did not also update the vendor to swarmkit. i've now updated the PR to vendor swarmkit up to the point similar to this PR to moby/moby moby/moby#35103

[andrewhsu]

@johnstep @jhowardmsft this error has popped up on two of the build runs:

01:41:06.949 FAIL: docker_cli_restart_test.go:265: DockerSuite.TestRestartContainerwithRestartPolicy
01:41:06.949 
01:41:06.949 docker_cli_restart_test.go:282:
01:41:06.949     // Make sure we can stop/start (regression test from a705e166cf3bcca62543150c2b3f9bfeae45ecfa)
01:41:06.949     dockerCmd(c, "stop", id1)
01:41:06.949 c:/gopath/src/github.com/docker/docker/vendor/github.com/gotestyourself/gotestyourself/icmd/command.go:61:
01:41:06.950     t.Fatalf("at %s:%d - %s\n", filepath.Base(file), line, err.Error())
01:41:06.950 ... Error: at cli.go:33 - 
01:41:06.950 Command:  d:\CI\CI-a761ee3d4d\binary\docker.exe stop cdd38e2935426686a6a8abfee3e1ab3ac901f0212cf958a4d36889860837e86d
01:41:06.950 ExitCode: 1
01:41:06.950 Error:    exit status 1
01:41:06.950 Stdout:   
01:41:06.950 Stderr:   Error response from daemon: cannot stop container: cdd38e2935426686a6a8abfee3e1ab3ac901f0212cf958a4d36889860837e86d: Cannot kill container cdd38e2935426686a6a8abfee3e1ab3ac901f0212cf958a4d36889860837e86d: invalid container: cdd38e2935426686a6a8abfee3e1ab3ac901f0212cf958a4d36889860837e86d
01:41:06.950 
01:41:06.950 
01:41:06.950 Failures:
01:41:06.950 ExitCode was 1 expected 0
01:41:06.950 Expected no error

[abhi]

LGTM