beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
35546 commits 14 branches 412 tags 338 MiB
Commit graph

1160 commits

Author SHA1 Message Date
Simon Ferquel
f28cb422e6 Added support for swarm service isolation mode 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-10-30 16:16:18 +01:00
Darren Stahl
0d4e253188 Update libnetwork 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-10-24 11:11:02 -07:00
Brian Goff
402540708c Merge pull request #34895 from mlaventure/containerd-1.0-client 
Containerd 1.0 client
 2017-10-23 10:38:03 -04:00
Kenfe-Mickael Laventure
7acea2a243
Vendor containerd 1.0 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-10-19 13:19:41 -07:00
Tobias Klauser
86f080cff0 Use Mkdev, Major and Minor functions from golang.org/x/sys/unix 
Update golang.org/x/sys to 8dbc5d05d6edcc104950cc299a1ce6641235bc86 in
order to get the Major, Minor and Mkdev functions for every unix-like
OS. Use them instead of the locally defined versions which currently use
the Linux specific device major/minor encoding.

This means that the device number should now be properly encoded on e.g.
Darwin, FreeBSD or Solaris.

Also, the SIGUNUSED constant was removed from golang.org/x/sys/unix in
https://go-review.googlesource.com/61771 as it is also removed from the
respective glibc headers.

Remove it from signal.SignalMap as well after the golang.org/x/sys
re-vendoring.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2017-10-19 08:28:38 +02:00
Brian Goff
3437f0f4e5 Merge pull request #34758 from ghislainbourgeois/33495-add-tcp-to-gelf-log-driver 
Add TCP support for GELF log driver
 2017-10-10 10:26:01 -04:00
Abhinandan Prativadi
2083121b09 Vendoring libnetwork and swarmkit 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-10-09 13:08:03 -07:00
Tobias Klauser
2b946fbc70 vendor: re-vendor github.com/Azure/go-ansiterm 
Re-vendor go-ansiterm to d6e3b3328b783f23731bc4d058875b0371ff8109 in
order to get the newly added console mode constants.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2017-10-02 09:47:38 +02:00
Sebastiaan van Stijn
e3c130df94
vendor tonistiigi/fsutil to dea3a0da73aee887fc02142d995be764106ac5e2 
removes the stevvooe/continuity dependency, which has moved to
containerd/continuity.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-09-30 18:04:11 +02:00
Sebastiaan van Stijn
853df8f32b Merge pull request #34990 from pradipd/update_field_name 
Update field name
 2017-09-27 20:00:18 +02:00
Kenfe-Mickaël Laventure
502eddb985 Merge pull request #34811 from yongtang/runc 
Update runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d
 2017-09-27 08:44:43 -07:00
Pradip Dhara
8e15b1cffb vndr swarmkit 941a01844b89c56aa61086fecb167ab3af1de22b 
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
 2017-09-26 22:08:10 +00:00
Tõnis Tiigi
37eb796ccb Merge pull request #34961 from fcrisciani/libnetwork-vendoring 
Vendoring libnetwork
 2017-09-26 10:50:32 -07:00
Yong Tang
e0ff1d147b Update runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d 
This fix updates runc to 0351df1c5a66838d0c392b4ac4cf9450de844e2d

With this fix the warnings generated by netgo and dlopen by go 1.9
are addressed.

See
- opencontainers/runc#1577
- opencontainers/runc#1579

This fix is part of the efforts for go 1.9 (#33892)

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-09-26 11:07:27 +00:00
Flavio Crisciani
04043428ea
Vendoring libnetwork 
Fix for networkDB garbage collection (PR: https://github.com/docker/libnetwork/pull/1944)
Added extra logs to monitor the netowrkDB status and number of entries per network

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-09-24 16:44:16 -07:00
Tonis Tiigi
ed6fd3d95b vendor: update buildkit 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-09-21 22:17:43 -07:00
Sebastiaan van Stijn
7cbbbb9509 Merge pull request #34846 from Microsoft/jjh/debuggcs 
LCOW: Add UVM debugability by grabbing logs before tear-down
 2017-09-19 22:33:46 +02:00
John Howard
2798576b37 Revendor Microsoft/opengcs @ v0.3.4 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-09-19 09:56:23 -07:00
Victor Vieux
a2ee40b98c Merge pull request #34674 from pradipd/windows_routingmesh 
Enabling ILB/ELB on windows using per-node, per-network LB endpoint.
 2017-09-18 15:56:17 -07:00
Pradip Dhara
4c1b07924a vendoring libnetwork and swarmkit 
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
 2017-09-18 20:38:18 +00:00
Akash Gupta
7a7357dae1 LCOW: Implemented support for docker cp + build 
This enables docker cp and ADD/COPY docker build support for LCOW.
Originally, the graphdriver.Get() interface returned a local path
to the container root filesystem. This does not work for LCOW, so
the Get() method now returns an interface that LCOW implements to
support copying to and from the container.

Signed-off-by: Akash Gupta <akagup@microsoft.com>
 2017-09-14 12:07:52 -07:00
Akash Gupta
ba13c173d1 Vendor containerd/continuity@22694c680e 
Signed-off-by: Akash Gupta <akagup@microsoft.com>
 2017-09-14 12:00:38 -07:00
Christy Perez
008b217844 revendor logrus and x/crypto 
this fixes the issue that was blocking a test from running on ppc64le.
the logrus revendor changes the color code used in that same test, so
that breaks the test for all platforms (updated in this pr)

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2017-09-14 11:05:47 -05:00
Darren Stahl
bffc7a423f Update hcsshim to v0.6.5 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-09-12 18:46:12 -07:00
Yong Tang
969b76d85f Merge pull request #34754 from Microsoft/jjh/read-only 
LCOW: VHDX boot to readonly.
 2017-09-12 08:35:21 -07:00
John Howard
e47c626e0a Revendor Microsoft/hcsshim @ v0.6.4 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-09-07 12:08:40 -07:00
Ghislain Bourgeois
b24c8e07f1 Update to latest go-gelf version and add tests 
Signed-off-by: Ghislain Bourgeois <ghislain.bourgeois@gmail.com>
 2017-09-06 15:55:58 -04:00
John Howard
bf898b7a0c Revendor Microsoft/opengcs @v0.3.3 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-09-06 12:55:25 -07:00
Flavio Crisciani
1ddeb11835
Vendoring libnetwork 
Diff:
5b28c0ec98...d5c8223190

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-08-31 19:10:23 -07:00
Yong Tang
e95585f7b0 Merge pull request #34667 from dnephin/add-container-config-decode-tests 
Add container config decode tests
 2017-08-30 07:25:27 -07:00
Daniel Nephin
385727588e Add gotestyourself/skip 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-29 14:35:12 -04:00
Vincent Demeester
15b8d0420b Merge pull request #33684 from dnephin/update-service-ps-tests 
Update service ps to be an API test
 2017-08-29 09:44:20 +02:00
Brian Goff
964ba0eaa8 Merge pull request #34331 from twistlock/plugable_secrets_backend 
[WIP] update swarmkit dependecies to support plugable secrets
 2017-08-28 10:31:27 -04:00
Daniel Nephin
381a1c0a5a Add gotestyourself to vendor. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-25 17:24:25 -04:00
Daniel Nephin
0a7ff351b7 Add gotestyourself to vendor 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-25 12:06:25 -04:00
Yong Tang
2cea2f5469 Merge pull request #34583 from tklauser/win-event-functions 
Use windows event functions from golang.org/x/sys/windows
 2017-08-25 07:43:03 -07:00
Victor Vieux
ff6fbe224f Merge pull request #34614 from dnephin/remove-pkg-testutil-tempfile 
Remove pkg testutil tempfile
 2017-08-24 15:24:15 -07:00
Daniel Nephin
47962ee32f Add gotestyourself to vendor. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-23 17:13:27 -04:00
Kenfe-Mickael Laventure
45d85c9913
Update containerd to 06b9cb35161009dcb7123345749fef02f7cea8e0 
This also update:
 - runc to 3f2f8b84a77f73d38244dd690525642a72156c64
 - runtime-specs to v1.0.0

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-08-21 12:04:07 -07:00
Tobias Klauser
df58f40a47 vendor: re-vendor golang.org/x/sys 
Update golang.org/x/sys to 07c182904dbd53199946ba614a412c61d3c548f5 in
order to get the newly added Windows event functions which will be used
in successive commits.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2017-08-21 12:48:05 +02:00
Liron Levin
3b8d36d064 plugable secret backend - update vendor.conf 
Updating swarmkit dependencies.

Add more parameters for the secret driver API.

Signed-off-by: Liron Levin <liron@twistlock.com>
 2017-08-18 21:52:26 +03:00
Flavio Crisciani
8570687647
Libnetwork vendoring 
- lock OS thread in overlay driver operation

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-08-16 09:48:12 -07:00
Madhu Venugopal
036314622d Merge pull request #34504 from fcrisciani/ln-vendoring 
Libnetwork vendoring
 2017-08-15 08:06:26 -07:00
Flavio Crisciani
167564a798
Libnetwork vendoring 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-08-14 09:31:23 -07:00
Victor Vieux
aaee3ca6c1 Merge pull request #34378 from fcrisciani/ln-vendoring 
Vendoring libnetwork
 2017-08-10 17:07:14 -07:00
Flavio Crisciani
709a433ec8
Vendoring libnetwork 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-08-10 08:51:30 -07:00
John Howard
779469d9c9 Revendor Microsoft/go-winio @ v0.4.5 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-08-09 08:31:43 -07:00
Yong Tang
5c49240c94 Merge pull request #34449 from Microsoft/jjh/hcsshim0.6.3 
Revendor Microsoft/hcsshim @V0.6.3
 2017-08-09 07:21:49 -07:00
John Howard
5463c58217 Vendor Microsoft/opengcs @ v0.3.2 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-08-08 15:43:43 -07:00
John Howard
3e71acf0fc Revendor Microsoft/hcsshim @V0.6.3 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-08-08 14:08:03 -07:00
John Howard
809fed5fa6 Revendor Microsoft/hcsshim @ v0.6.2 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-08-03 16:29:25 -07:00
John Stephens
a3ffc42b13 Merge pull request #34170 from Microsoft/jjh/sandbox 
LCOW: Dynamic sandbox management
 2017-08-03 16:07:40 -07:00
John Howard
0bd1cf2517 Revendor jhowardmsft/opengcs @ v0.0.12 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-08-03 09:06:45 -07:00
John Howard
45e2dd123b Revendor microsoft/go-winio @ v0.4.4 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-08-03 09:06:26 -07:00
Sebastiaan van Stijn
f577caff19 Merge pull request #34360 from FengtuWang/arm64_testcase 
fix TestLogsFollowGoroutinesWithStdout in arm64
 2017-08-02 16:56:20 +02:00
FengtuWang
6e590d3b99 fix TestLogsFollowGoroutinesWithStdout in arm64 
Test case TestLogsFollowGoroutinesWithStdout failed in
arm64 because gopkg.in/fsnotify.v1 does not support
arm64 until version v1.3.0. Update fsnotify to latest
version v1.4.2 to support arm64.

see issue https://github.com/fsnotify/fsnotify/issues/112

Signed-off-by: Fengtu Wang <wangfengtu@huawei.com>
 2017-08-02 10:08:00 +08:00
Derek McGowan
4f3616fb1c
Update imports for logrus version 
Add forks for changes which only make logrus change without functional
change.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-07-31 13:19:38 -07:00
Derek McGowan
1009e6a40b
Update logrus to v1.0.1 
Fixes case sensitivity issue

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2017-07-31 13:16:46 -07:00
Sebastiaan van Stijn
1375d893e9 Merge pull request #34304 from tiborvass/use-buildkit-session 
Use buildkit session package
 2017-07-31 11:16:27 -07:00
Tibor Vass
5898a36463 vendor github.com/moby/buildkit/session 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-07-28 16:34:24 -07:00
Flavio Crisciani
68d8198ed0
Libnetwork vendoring 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-07-28 13:51:54 -07:00
Brian Goff
08f7cf0526 Merge pull request #34123 from twistlock/plugable_secrets_backend 
pluggable secret backend
 2017-07-17 19:00:30 -04:00
Liron Levin
7d45cafd57 pluggable secret backend 
This commit extends SwarmKit secret management with pluggable secret
backends support.

Updating the work in
[swarmkit](docker/swarmkit@eebac27434) for
pluggable secret backend and adding the
driver parameter to `SecretSpec`.

Remaining work:
- [ ] CLI support (docker/cli)
- [ ] api in [plugin helpers](docker/go-plugins-helpers))
- [ ] Reference plugin
- [ ] Documenation (after cli work)

Signed-off-by: Liron Levin <liron@twistlock.com>
 2017-07-15 16:50:02 +03:00
Tonis Tiigi
72df48d1ad vendor: add archive/tar 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-07-13 19:08:19 -07:00
Sebastiaan van Stijn
96bf279c7d Merge pull request #33539 from tklauser/x-sys-unix-symlink-xattrs 
Use symlink xattr functions from x/sys/unix
 2017-07-12 18:04:33 -07:00
Tobias Klauser
bd13a5a9e0 vendor: re-vendor golang.org/x/sys 
Update golang.org/x/sys to 739734461d1c916b6c72a63d7efda2b27edb369f in
order to get the Lgetxattr, Llistxattr, Lremovexattr and Lsetxattr
syscall wrappers. These will be used in a successive commit to replace
the wrappers in libcontainer/system/xattr_linux.go.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2017-07-12 08:26:51 +02:00
Sebastiaan van Stijn
9fc66ec869
bump image-spec to 372ad780f63454fbbbbcc7cf80e5b90245c13e13 
this commit matches what's used in SwarmKit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-11 20:52:17 -07:00
Ying Li
4509a001df Re-vendor swarmkit. This includes the following fixes: 
- https://github.com/docker/swarmkit/pull/2266 (support for templating Node.Hostname in docker executor)
- https://github.com/docker/swarmkit/pull/2281 (change restore action on objects to be update, not delete/create)
- https://github.com/docker/swarmkit/pull/2285 (extend watch queue with timeout and size limit)
- https://github.com/docker/swarmkit/pull/2253 (version-aware failure tracking in the scheduler)
- https://github.com/docker/swarmkit/pull/2275 (update containerd and port executor to container client library)
- https://github.com/docker/swarmkit/pull/2292 (rename some generic resources)
- https://github.com/docker/swarmkit/pull/2300 (limit the size of the external CA response)
- https://github.com/docker/swarmkit/pull/2301 (delete global tasks when the node running them is deleted)

Minor cleanups, dependency bumps, and vendoring:
- https://github.com/docker/swarmkit/pull/2271
- https://github.com/docker/swarmkit/pull/2279
- https://github.com/docker/swarmkit/pull/2283
- https://github.com/docker/swarmkit/pull/2282
- https://github.com/docker/swarmkit/pull/2274
- https://github.com/docker/swarmkit/pull/2296 (dependency bump of etcd, go-winio)

Signed-off-by: Ying Li <ying.li@docker.com>
 2017-07-11 13:43:43 -07:00
Sebastiaan van Stijn
63f4bc5237
Bump vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587 
This bumps vndr to 9909bb2b8a0b7ea464527b376dc50389c90df587
and revendors dependencies.

Includes a change that prunes go files with `+build ignore`

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-10 14:05:13 -07:00
Sebastiaan van Stijn
0ea804c240 Merge pull request #33996 from thaJeztah/un-fork-etcd 
Un-fork coreos/etcd - bump to v3.2.1
 2017-07-10 09:14:22 -07:00
Aaron Lehmann
733f672100 vendor: add go-semver 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-07-07 16:42:14 -07:00
John Howard
7643e89096 Revendor jhowardmsft/opengcs v0.0.9 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-07-06 14:29:43 -07:00
Sebastiaan van Stijn
cbc480a40c
Un-fork coreos/etcd - bump to v3.2.1 
Commit 077f08bf54
temporarily switch etcd to a fork, pending a
pull-request to be merged, and a new release
that contains the change.

The pull request was merged, and included in
etcd v3.2.0

This patch bumps etcd to v3.2.1, which contains
some bug-fixes on top of v3.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-07-06 13:58:13 -07:00
John Howard
3f14e25a7f Vendor github.com/jhowardmsft/opengcs v0.0.7 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-06-26 21:24:39 -07:00
Vincent Demeester
497e6e0caa
Update go-connections dependency 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-06-24 12:40:49 +02:00
John Howard
25a65a185b Merge pull request #33785 from Microsoft/jjh/hcsschemaupdate 
LCOW: Updates necessary due to platform schema change
 2017-06-23 13:08:13 -07:00
John Howard
c75db46d5b Vendor jhowardmsft/opengcs v0.0.4 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-06-22 19:28:49 -07:00
John Howard
9508c605d8 Vendor Microsoft/hcsshim v0.5.25 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-06-22 19:28:43 -07:00
Sebastiaan van Stijn
9f5f3e49da Merge pull request #33738 from fcrisciani/libnetwork-vendoring 
Libnetwork vendoring
 2017-06-22 17:41:46 -07:00
Sebastiaan van Stijn
4d0c01ac17 Merge pull request #33773 from aaronlehmann/vendor-swarmkit-79381d0 
Vendor swarmkit 79381d0
 2017-06-22 16:26:34 -07:00
Tonis Tiigi
7cfcf74a90 vendor: update deps for fssession 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-06-22 11:22:42 -07:00
Tonis Tiigi
ec7b6238c3 Add long-running client session endpoint 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-06-22 11:22:41 -07:00
Brian Goff
4bdb6ed9b5 Merge pull request #33750 from dnephin/cleanup-more-cli-leftovers 
Cleanup more cli leftovers
 2017-06-21 21:23:28 -07:00
Aaron Lehmann
79b940feee Vendor swarmkit 79381d0 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-06-21 15:32:53 -07:00
Daniel Nephin
4e5293c253 Remove miekg/pkcs11 from vendor. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-06-21 11:18:44 -04:00
John Howard
07034a4420 Vendor jhowardmsft/opengcs v0.0.3 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-06-20 19:49:56 -07:00
John Howard
8fe9eb0551 Vendor Microsoft/hcsshim @ v0.5.2 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-06-20 19:49:55 -07:00
Flavio Crisciani
e1953f1ca7
Libnetwork vendoring 
Fixes in the Service Discovery areas

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-06-19 19:42:24 -07:00
Tonis Tiigi
932759c288 vendor: remove unused package 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-06-15 13:23:11 -07:00
Aaron Lehmann
32d7b0f360 Vendor swarmkit a4bf013 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-06-12 10:31:11 -07:00
Madhu Venugopal
6868b8ef23 Vendoring libnetwork f4a15a0890383619ad797b3bd2481cc6f46a978d 
Contains Service Discovery hardening fixes via
https://github.com/docker/libnetwork/pull/1796

Fixes multiple issues such as #32830

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-06-12 01:01:45 -07:00
Ian Campbell
379557a958 Update grpc to v1.3.0 and bump protobuf bindings. 
and update some dependent packages.

We would like to keep moby/moby and swarmkit somewhat in sync here and
https://github.com/docker/swarmkit/pull/2229 proposes a similar bump to
swarmkit, needed due to https://github.com/docker/swarmkit/pull/1965 which
pulls in containerd which uses some newer features of the grpc package.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-06-08 14:34:23 +01:00
Madhu Venugopal
5fd65a6b6c Vendoring libnetwork and netlink 
libnetwork eb57059e91bc54c9da23c5a633b75b3faf910a68
netlink bd6d5de5ccef2d66b0a26177928d0d8895d7f969

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-06-07 06:20:27 -07:00
Madhu Venugopal
0484bdb6ca Vendoring libnetwork 2e99f06621c23a5f4038968f1af1e28c84e4104e 
Fixes #33415
Fixes #33346
Implemented few additional IPVS APIs to be used by other projects

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-05-31 16:04:00 -07:00
Vincent Demeester
6629f1d0e7 Merge pull request #33360 from aaronlehmann/vendor-swarmkit-7e096ced 
Vendor swarmkit 7e096ced
 2017-05-30 09:59:48 -07:00
Darren Stahl
3f13107223 Update go-winio to v0.4.2 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-05-23 18:27:50 -07:00
Aaron Lehmann
10df99f9ae Vendor swarmkit 7e096ced 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-23 15:01:35 -07:00
Aaron Lehmann
aa6fc939ba vendor: Remove docker-credential-helpers 
This appears to be a remnant from the CLI that is no longer imported
anywhere. Remove it from vendor.conf and the vendor directory.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-22 13:58:28 -07:00
Vincent Demeester
65f360fc41 Merge pull request #33310 from darrenstahlmsft/RevendorGowinio 
Revendor go-winio to v0.4.1
 2017-05-22 10:31:57 -07:00
Darren Stahl
af7d8d09ef Revendor go-winio to v0.4.1 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-05-19 16:13:52 -07:00
Darren Stahl
b90f294c1c Revendor runtime-spec 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-05-19 12:33:14 -07:00
Madhu Venugopal
9b0e1df4dd Vendoring libnetwork 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-05-18 15:14:12 -07:00
Abhinandan Prativadi
f3d8ff774e swarmkit vendoring 
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
 2017-05-17 18:46:34 -07:00
Alessandro Boch
3950cef941 Vendor gogoprotobuf v0.4 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Alessandro Boch
8daeeacfc1 Vendor swarmkit @998a47f 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Alessandro Boch
46392f2442 Vendoring libnetwork @b2bc1a6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-05-17 15:50:28 -07:00
Brian Goff
4dd3e5b77c Merge pull request #33075 from x1022as/stop 
fix inconsistent state string with containerd
 2017-05-17 09:27:47 -04:00
Aaron Lehmann
309f99edae api: Use OCI types for Digest and Platform 
The current use of the types from distribution brings in some
unfortunate dependencies, including other distribution packages and the
gorilla/mux and gorilla/context packages. Using the OCI types avoids
the extra dependencies for client users.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-16 14:54:23 -07:00
Kenfe-Mickael Laventure
8c340b7edf Add missing go-difflib vendoring 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-15 11:23:52 -07:00
Kenfe-Mickael Laventure
0ea0b2becf Use containerd Status variable when checking container state 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-05-15 10:53:51 -07:00
Aaron Lehmann
0a377b5f56 Update go-metrics to match swarmkit's dependency 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-12 17:40:46 -07:00
Aaron Lehmann
721b7a7fad Vendor swarmkit ae29cf2 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-12 17:36:11 -07:00
Flavio Crisciani
385176980e
Libnetwork vendoring 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-05-10 21:16:57 -07:00
Madhu Venugopal
2ca41c47c4 Merge pull request #33100 from fcrisciani/memberlist_version 
Libnetwork vendoring
 2017-05-10 21:09:38 -07:00
Darren Stahl
24d4177859 Update go-winio to v0.4.0 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-05-09 17:49:55 -07:00
Flavio Crisciani
7ff9fb5f04
Libnetwork vendoring 
Fixes backward compatibility for memberlist

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-05-09 13:41:54 -07:00
John Howard
1bb3f57c45 Revendor Microsoft\hcsshim @ v0.5.17 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-05-09 11:44:14 -07:00
Brian Goff
5122abeb44 Re-run vndr 
Now that the CLI is gone there are lots of packages that need to be
pruned from vendor.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-09 10:59:25 -04:00
Tibor Vass
4b846a125b Merge pull request #33059 from nishanttotla/vendor-swarmkit 
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
 2017-05-08 14:27:51 -07:00
Kenfe-Mickaël Laventure
7238cca42c Merge pull request #33007 from crosbymichael/containerd-rc5 
Update moby to containerd and runc 1.0 final rc
 2017-05-08 09:23:07 -07:00
Nishant Totla
1b68641fc8
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-05-05 14:18:12 -07:00
Michael Crosby
005506d36c Update moby to runc and oci 1.0 runtime final rc 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2017-05-05 13:45:45 -07:00
Brian Goff
669f4ba37e Merge pull request #29554 from cpuguy83/keep_running_count_of_states 
Use counter for tracking container states
 2017-05-05 16:15:22 -04:00
Aaron Lehmann
077f08bf54 Vendor swarmkit 8f053c2 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-02 15:51:26 -07:00
Ian Campbell
a28d91349e Update to latest vndr c56e08229111 
Changes are:

$ git log --no-merges --oneline 19220953c4a4..c56e08229111
4b76270 Keep "vendor.conf" for reference
ac8f766 travis: update to go 1.8.1
c196644 Better validation of duplicates
e684d5e check for unused packages at the end
3ed2513 detect default gopath($HOME/go)
c9052f3 fix backtick in readme
0e04f23 Missing installation section in README

Changes to moby are the inclusion of several upstream vendor.conf files and
switching to vendoring the toplevel golang.org/x/sync package rather than the
syncmap sub-package due to:

2017/05/02 11:21:06 WARNING: package golang.org/x/sync/syncmap is not root import, should be golang.org/x/sync

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-05-02 11:23:36 +01:00
Daniel Nephin
f07811f766 Vendor syncmap 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-01 11:49:43 -04:00
Brian Goff
e4c03623c2 Use counter for tracking container states 
Container state counts are used for reporting in the `/info` endpoint.
Currently when `/info` is called, each container is iterated over and
the containers 'StateString()' is called. This is not very efficient
with lots of containers, and is also racey since `StateString()` is not
using a mutex and the mutex is not otherwise locked.

We could just lock the container mutex, but this is proven to be
problematic since there are frequent deadlock scenarios and we should
always have the `/info` endpoint available since this endpoint is used
to get general information about the docker host.

Really, these metrics on `/info` should be deprecated. But until then,
we can just keep a running tally in memory for each of the reported
states.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-04-29 17:10:14 -04:00
Vincent Demeester
4219156a62 Merge pull request #32687 from runcom/oci-selinux 
Switch to using opencontainers/selinux for selinux bindings
 2017-04-29 19:05:32 +02:00
Tibor Vass
30221cc521 Merge pull request #32902 from fcrisciani/memberlist_bump 
Vendoring memberlist tag 0.1.0
 2017-04-28 18:42:21 -07:00
Flavio Crisciani
44c3de8450
Libnetwork vendoring 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-28 13:17:44 -07:00
Flavio Crisciani
01fd4e49c3
Vendoring memberlist tag 0.1.0 
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-27 13:21:35 -07:00
Flavio Crisciani
b96988feb9
Libnetwork vendoring 
Vendor libnetwork changes for --data-path-addr flag

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-26 15:33:13 -07:00
Antonio Murdaca
abbbf91498
Switch to using opencontainers/selinux for selinux bindings 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-04-24 21:29:47 +02:00
Tõnis Tiigi
cd4c089b9e Merge pull request #32626 from aaronlehmann/vendor-swarmkit-61a92e8 
Vendor swarmkit 61a92e8
 2017-04-17 23:24:43 -05:00
Aaron Lehmann
6052f2b396 Remove pkg/testutil/assert in favor of testify 
I noticed that we're using a homegrown package for assertions. The
functions are extremely similar to testify, but with enough slight
differences to be confusing (for example, Equal takes its arguments in a
different order). We already vendor testify, and it's used in a few
places by tests.

I also found some problems with pkg/testutil/assert. For example, the
NotNil function seems to be broken. It checks the argument against
"nil", which only works for an interface. If you pass in a nil map or
slice, the equality check will fail.

In the interest of avoiding NIH, I'm proposing replacing
pkg/testutil/assert with testify. The test code looks almost the same,
but we avoid the confusion of having two similar but slightly different
assertion packages, and having to maintain our own package instead of
using a commonly-used one.

In the process, I found a few places where the tests should halt if an
assertion fails, so I've made those cases (that I noticed) use "require"
instead of "assert", and I've vendored the "require" package from
testify alongside the already-present "assert" package.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-14 12:03:21 -07:00
Aaron Lehmann
f2146cb74b Vendor swarmkit 61a92e8 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-14 10:20:58 -07:00
Ying Li
e34bee387e Re-vendor swarmkit to a version which does not require all cluster updates 
to include an external CA certificate when updating external CAs.

Signed-off-by: Ying Li <ying.li@docker.com>
 2017-04-12 16:55:47 -07:00
Vincent Demeester
1a8206ca1f Merge pull request #32521 from mkumatag/update_shellwords 
Vendor package update github.com/mattn/go-shellwords
 2017-04-11 18:27:37 +02:00
Sebastiaan van Stijn
f30e94a495 Merge pull request #32505 from fcrisciani/conntrack_test 
Conntrack flush support
 2017-04-11 16:40:56 +02:00
Manjunath A Kumatagi
3d6d9061e3 Vendor package update github.com/mattn/go-shellwords 
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
 2017-04-11 18:14:00 +05:30
Flavio Crisciani
c16eb5f88a
Vendoring Libnetwork library 
- adding conntrack flush fix for docker/docker#8795

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-10 17:52:16 -07:00
Flavio Crisciani
e88bc31afa
Vendoring Netlink library 
- Added conntrack support

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
 2017-04-10 17:09:24 -07:00
Sebastiaan van Stijn
28334c1d82 Merge pull request #28403 from cpuguy83/logging_plugins 
Implement plugins for logging drivers
 2017-04-10 21:57:56 +02:00
Brian Goff
27bd6842f8 Implement plugins for logging drivers 
Logging plugins use the same HTTP interface as other plugins for basic
command operations meanwhile actual logging operations are handled (on
Unix) via a fifo.

The plugin interface looks like so:

```go
type loggingPlugin interface {
  StartLogging(fifoPath string, loggingContext Context) error
  StopLogging(fifoPath)
```

This means a plugin must implement `LoggingDriver.StartLogging` and
`LoggingDriver.StopLogging` endpoints and be able to consume the passed
in fifo.

Logs are sent via stream encoder to the fifo encoded with protobuf.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-04-10 13:17:20 -04:00
Sebastiaan van Stijn
2daa2b894c Merge pull request #31364 from adshmh/30935-use-encrypted-client-certificate-to-connect-to-a-docker-host 
use an encrypted client certificate to connect to a docker daemon
 2017-04-10 10:42:01 +02:00
Madhu Venugopal
9f27f0dcd3 Merge pull request #32447 from aboch/vnd 
Fix container no ipv6 when run container on --network=host
 2017-04-09 15:07:58 -07:00
Aaron Lehmann
ff06898930 Vendor swarmkit d5232280 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-07 17:10:16 -07:00
Alessandro Boch
60c36f88a5 Vendoring libnetwork @ab8f7e6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-04-07 16:35:29 -07:00
Vincent Demeester
87562af45b Merge pull request #32283 from aboch/clearingress 
Daemon to take care of ingress cleanup on cluster leave and graceful shutdown
 2017-04-07 20:09:27 +02:00
Arash Deshmeh
7180f887ea vendor docker/go-connections to include the enhacement for decrypting keys 
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
 2017-04-07 01:50:50 -04:00
Ian Campbell
b7ced33036 Revendor github.com/Nvveen/Gotty for github.com/Nvveen/Gotty#2 
This fixes https://github.com/docker/docker/issues/32400

We were already actually vendoring from github.com/ijc25/Gotty in order to
pickup github.com/Nvveen/Gotty#1. github.com/ijc25/Gotty#master now contains
merges of both of those upstream PRs.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-04-06 12:19:32 +01:00
Andrea Luzzardi
367b57d985 Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2017-04-05 18:49:23 -07:00
Alessandro Boch
bf5bebdfa0 Vendoring libnetwork @f3c4ca8 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-04-05 16:31:28 -07:00
Alessandro Boch
747f0b4ba5 Vendoring swarmkit @b74ec2b 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-30 16:12:33 -07:00
Sebastiaan van Stijn
2ce39de0c8 Merge pull request #32010 from dongluochen/swarmkit_vendor 
vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
 2017-03-30 17:24:33 +02:00
Alessandro Boch
694c787123 Vendoring vishvananda/netlink @c682914 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-29 10:58:02 -07:00
Dong Chen
aac861f3d9 vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
 2017-03-28 11:51:33 -07:00
Madhu Venugopal
04295d26df Merge pull request #31714 from aboch/cingr 
Allow user to replace ingress network
 2017-03-27 07:30:42 -07:00
Alessandro Boch
ff049a4d4d Vendor libnetwork @b6cb1ee 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-24 11:07:33 -07:00
Alessandro Boch
434e9695e4 Vendoring swarmkit @9fdea50 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-24 11:07:33 -07:00
John Howard (VM)
4f7db6739d Revendor HCSShim @ v0.5.13 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-03-23 11:47:05 -07:00
Victor Vieux
afe1c5c2eb Merge pull request #31705 from cyli/bump-go-connections 
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
 2017-03-21 10:36:41 -07:00
David Gageot
97b572ea1b Windows: Fix Docker hanging with named pipes and stdin 
Fixes #31922

Vendor a fork of Microsoft/go-winio that has this
PR (https://github.com/Microsoft/go-winio/pull/43)
merged


Signed-off-by: David Gageot <david@gageot.net>
 2017-03-21 11:49:57 +01:00
Madhu Venugopal
cdf66ba715 Merge pull request #31710 from sanimej/drillerrr 
Add verbose flag to network inspect to show all services & tasks in swarm mode
 2017-03-13 21:12:32 -07:00
Vincent Demeester
9dec486cf6
Update docker-credential-helpers to v0.5.0 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-13 21:08:41 +01:00
Santhosh Manohar
6708676464 Vendor libnetwork for network inspect --verbose changes 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2017-03-12 21:23:21 -07:00
Tibor Vass
43f8bce876 Merge pull request #31743 from aaronlehmann/vendor-swarmkit-0e2d9eb 
Vendor swarmkit 0e2d9eb
 2017-03-10 16:33:15 -08:00
Aaron Lehmann
79bf23845b Vendor swarmkit 0e2d9eb 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-10 11:15:44 -08:00
Brian Goff
05e7f956bd Merge pull request #31532 from aboch/vnd 
Vendoring libnetwork @1a01921
 2017-03-10 12:55:19 -05:00
Ying Li
868f90a0db Bump the version of go-connections 
Signed-off-by: Ying Li <ying.li@docker.com>
 2017-03-09 11:19:14 -08:00
Kenfe-Mickael Laventure
49131f3ad4 Update runc to 54296cf40ad8143b62dbcaa1d90e520a2136ddfe 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-08 14:56:29 -08:00
Tõnis Tiigi
3fe2730ab3 Merge pull request #31535 from aaronlehmann/vendor-swarmkit-7fc7503 
Vendor swarmkit d60ccf3
 2017-03-08 09:52:28 -08:00
Sebastiaan van Stijn
7e031413f2 Merge pull request #31566 from AkihiroSuda/use-latest-vndr 
rerun vndr
 2017-03-08 12:16:50 +01:00
Aaron Lehmann
39433318fe Vendor swarmkit d60ccf3 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-07 19:09:21 -08:00
Akihiro Suda
5a1b06d7fd rerun vndr 
* run latest vndr so as to collect more LICENSE files
 * remove unused packages
 * vendor github.com/philhofer/fwd with LICENSE.md (MIT)
 * vendor github.com/bsphere/le_go with LICENSE (MIT)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-08 02:29:34 +00:00
Justin Cormack
9067ef0e32 Seccomp Update 
- Update libseccomp-golang to 0.9.0 release
- Update libseccomp to 2.3.2 release
- add preadv2 and pwritev2 syscalls to whitelist

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-03-07 22:19:46 +00:00
Alessandro Boch
b005c7d6eb Vendoring libnetwork @1a01921 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-03 15:55:06 -08:00
Kenfe-Mickaël Laventure
d8b0d2b9e9 Merge pull request #30729 from dmcgowan/update-go-connections 
Update go-connections package
 2017-03-01 18:24:32 -08:00
Vincent Demeester
c956d25bfc Merge pull request #31393 from aaronlehmann/vendor-swarmkit-46bbd41 
Vendor swarmkit 46bbd41
 2017-02-28 09:40:20 +01:00
Aaron Lehmann
99119fcafa Vendor swarmkit 46bbd41 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-02-27 11:51:00 -08:00
Alessandro Boch
ff6a3bef5a Vendoring libnetwork @bdc9dce 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-02-24 11:08:53 -08:00
Kenfe-Mickael Laventure
6f0e2c8c8b Bump runc to version a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-02-22 14:10:33 -08:00
Victor Vieux
7761c69e23 Merge pull request #31055 from Microsoft/jjh/fix30278 
Windows: Retry workaround for RS1/RS2 compute system enumeration
 2017-02-17 16:53:16 -08:00
Yong Tang
ec860ca252 Update SwarmKit to 6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0 
This fix tries to update the SwarmKit from
ed384f3b3957f65e3111bd020f9815f3d4296fa2
to
6bc357e9c5f0ac2cdf801898a43d08c260b4d5d0

The following is the list of docker related changes:
1. Took long time for Docker Swarm service turn desired state from Ready to Running (Issue #28291)
2. Native Swarm in 1.12 - panic: runtime error: index out of range (Issue #25608)
3. Global mode target replicas keep increasing (Issue #30854)
4. Creating service with publish mode=host and without published port crashes swarm manager (Issue #30938)
5. Define signals used to stop containers for updates (Issue #25696) (PR #30754)

This fix fixes #28291, #25608, #30854, #30938.
This fix is required by PR #30754.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-02-16 08:50:00 -08:00
John Howard
9983a7b88f Revendor Microsoft\hcsshim to v0.5.12 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-02-15 10:16:16 -08:00
Alessandro Boch
5b6048fd63 Vendoring libnetowrk @5537cb4 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-02-14 11:52:57 -08:00
Yong Tang
20141b5219 Update docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621 
This fix updates docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621
from 545102ea07aa9796f189d82f606b7c27d7aa3ed3

Changes related to docker issue:
1. Validate insecure registry (`--insecure-registry`) values (30746)

This fix is related to 30746.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-02-13 16:37:47 -08:00
Sebastiaan van Stijn
1eb2841334 Merge pull request #30839 from yongtang/02082017-swarmkit-update 
Update SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2
 2017-02-10 10:14:30 -08:00
Derek McGowan
4f223337a5 Update go-connections package 
fixes #30450

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2017-02-09 16:10:38 -05:00
Brian Goff
7efc286518 Merge pull request #30146 from tonistiigi/update-net 
vendor: update golang/net to c427ad74c
 2017-02-09 12:41:08 -05:00
Yong Tang
6fb3a9d33c Update SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2 
This fix updates SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2.
Notable changes since last update (3ca4775ba4a5519e2225c3337c7db8901ec39d26):

1. Fix duplicated ports allocation with restarted swarm. (Docker issue #29247)
2. Topology-aware scheduling (Docker PR #30725)

Docker issue #29247 was labeled 1.13.1, though it is advised that
related SwarmKit changes only to be merged to master
(based on the feedback https://github.com/docker/swarmkit/pull/1802#issuecomment-274143500)

This fix fixes #29247 (master only).
This fix is related to #30725.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-02-08 11:59:13 -08:00
Akihiro Suda
31f172bdb5 Merge pull request #30790 from vdemeester/pr-30602 
Carry #30602 : Bump go-units
 2017-02-08 11:04:22 +09:00
Vincent Demeester
254fc83cba Merge pull request #30457 from dmcgowan/distribution-reference-update-2 
reference: use distribution reference and remove fork
 2017-02-07 22:01:25 +01:00
Vincent Demeester
cb89d658dc
Bump go-units 
To include  https://github.com/docker/go-units/pull/23
Fixes a unit test that fails because of it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-02-07 21:58:56 +01:00
Derek McGowan
2bea87393b
Update swarmkit vendor 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2017-02-07 11:08:36 -08:00
Aaron.L.Xu
79d47a3bb7 fetch the latest code with zero-harm but good-readability for Graylog2/go-gelf 
update vendor.conf for github.com/Graylog2/go-gelf

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
 2017-02-07 17:27:17 +08:00
Derek McGowan
24698a07cb
Update distribution vendor 
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2017-02-06 13:06:52 -08:00
Tõnis Tiigi
00d2057698 Merge pull request #30760 from justincormack/yamlup 
Update Go Yaml
 2017-02-06 11:14:55 -08:00
Brian Goff
1d3f6e4aaf Merge pull request #30690 from aboch/vnd 
Vendoring libnetwork @802895f
 2017-02-06 13:20:51 -05:00
Justin Cormack
08304e8538 Update Go Yaml 
- changes license to Apache from LGPLv3
- small fixes for Go 1.8, parsing.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2017-02-06 13:08:58 +00:00