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

85 commits

Author SHA1 Message Date
John Howard
7b15b4a9b2 Revendor Microsoft/go-winio v0.3.8 
Signed-off-by: John Howard <jhoward@microsoft.com>
(cherry picked from commit da6739c99f)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-02-01 12:00:11 -08:00
Kenfe-Mickael Laventure
0311ed7b1c Update containerd to version aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-01-31 15:01:55 -08:00
Yong Tang
1e0179589d [1.13.x] Cherry-pick SwarmKit update to 0af40501a9cc98cd3e9425d2e4246dd3eff5526e 
This fix cherry-pick SwarmKit update to 0af40501a9cc98cd3e9425d2e4246dd3eff5526e
for branch 1.13.x. The following has been added:
- [docker/swarmkit#1909]: raft: Disable address change detection
- [docker/swarmkit#1910]: Fix issue in service update of published ports in host mode

This fix fixes #30199 in docker.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-01-30 15:22:48 -08:00
Madhu Venugopal
e6f89d1af5 Vendoring libnetwork 2c8b683 
to address #30295

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-01-26 04:38:21 -08:00
Daniel Nephin
5bf7901f5d Replace vendor of aanand/compose-file with a local copy. 
Add go-bindata for including the schema.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-01-25 16:04:05 -05:00
Anusha Ragunathan
f0f020a579 Vendor swarmkit 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2017-01-25 10:13:26 -08:00
Tõnis Tiigi
fc82c4b391 Merge pull request #30044 from tonistiigi/update-runc-113 
[v1.13] vendor: update runc to 2f7393a4
 2017-01-11 08:37:36 -08:00
Tonis Tiigi
acbad31dcd vendor: update runc to 2f7393a4 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-01-10 18:07:20 -08:00
Aaron Lehmann
18fd3885c6 Update vendored swarmkit to 296fcfc 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-10 16:07:45 -08:00
Aaron Lehmann
3fc1510dff [1.13] Update vendored swarmkit to 70cb786 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-10 12:55:35 -08:00
Vincent Demeester
340f288211 Merge pull request #29962 from vieux/1.13.0-rc6-cherrypicks 
1.13.0 rc6 cherrypicks
 2017-01-10 10:09:04 +01:00
Aaron Lehmann
831eeb38f1 [1.13] Update vendored swarmkit to 8ea08a3 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-09 11:45:04 -08:00
Sebastiaan van Stijn
46af2edec2 un-fork go-memdb 
commit 9322636c89
temporarily switched to a fork of go-memdb, because
a pull request that was needed was not yet merged
upstream.

this pull request was merged, so we can un-fork
this dependency.

this change does not bump the dependency, and
only un-forks. bumping the dependency should
be done in a separate change, if needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5f057f6350)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2017-01-09 06:37:40 -08:00
Aaron Lehmann
f2260228a7 vendor: Unfork logrus dependency 
Vendor the latest official logrus release instead of a custom fork
(which now happens to be identical to the fork).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit 11df2db538)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2017-01-09 06:37:40 -08:00
Aaron Lehmann
eb5273edd4 [1.13] Revendor swarmkit to 7f910df 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-01-05 14:53:47 -08:00
Madhu Venugopal
15293063ba Vendoring libnetwork to bring in isbuiltin changes 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2017-01-03 15:37:47 -08:00
Derek McGowan
a55a9b14d1 Update distribution vendor for manifest builder change 
Manifest builder allows setting the configuration type
for the manifest being build. Additionally the default
type has been renamed to reflect it is an image type.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
(cherry picked from commit 61ac7c4bf8)
 2016-12-27 13:30:44 -08:00
Aaron Lehmann
e460a5f45c Vendor swarmkit from bump_v1.13.0 branch 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-16 10:44:25 -08:00
Justin Cormack
45b441f4f9 Merge pull request #29395 from mavenugo/exp13 
Cherry-pick : Add the missing experimental ipvlan network driver
 2016-12-15 14:56:00 -08:00
Victor Vieux
1b521547f0 Merge pull request #29229 from vieux/1.13.0-rc4-cherrypicks 
1.13.0-rc4 cherry-picks: part1
 2016-12-14 17:18:17 -08:00
Madhu Venugopal
b7316e85c0 Vendor libnetwork with experimental daemon flag handling 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-12-14 00:54:57 -08:00
Santhosh Manohar
4b7bef26c5 Update libnetwork to 4df06c4 
This fixes docker #28931, #28172, #28969

Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-12-12 11:40:14 -08:00
Yong Tang
30b458a28c [1.13.x] Update vendored swarmkit to b5f07ce49c66d2f5feee83998b23d4c905b78155 
This fix update swarmkit to b5f07ce49c66d2f5feee83998b23d4c905b78155

The following changes have been included:
- Fix missing IPAM options in swarm network mode (docker/swarmkit#1789)

The above PR is related to docker PR #29074 and docker issue #29044.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-12-10 04:02:22 -08:00
Derek McGowan
9ecbaa77ae Update vendor distribution 
Distribution client change for class in resource

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
(cherry picked from commit d1f5e0f7a6)
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-12-09 14:10:23 -08:00
Aaron Lehmann
aca0bdab13 Update vendored swarmkit to 999addf 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-07 17:59:31 -08:00
Tõnis Tiigi
90c3c389c4 Merge pull request #28999 from mavenugo/1.13.0-rc3-ln 
Cherry-picking #28975 to 1.13.x
 2016-12-02 13:25:43 -08:00
Aaron Lehmann
df71cee489 Vendor swarmkit 
Update swarmkit to 522d951f733c821cdc33cccca6127c15a2b6de38, from the
bump_v1.13.0 branch.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-12-01 18:42:24 -08:00
Madhu Venugopal
1f289dc411 Vendoring libnetwork to address some concurrency issues 
Addresses #28697, #28845, #28712, #26111

Signed-off-by: Madhu Venugopal <madhu@docker.com>
(cherry picked from commit 8f082e418b)
 2016-11-30 13:28:21 -08:00
Andrea Luzzardi
2a80a863ca 1.13.x: revendor swarmkit to 1109c363ce9d6400d42908ead944df4f7f788860 
Includes:
- https://github.com/docker/swarmkit/pull/1766
- https://github.com/docker/swarmkit/pull/1770

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-22 18:50:46 -08:00
Victor Vieux
44fe761b35 Merge pull request #28674 from vieux/1.13.0-rc2-cherrypicks 
1.13.0-rc2 cherry-picks : part 3
 2016-11-22 18:39:06 -08:00
Darren Stahl
af08f44640 Revendor go-winio to v0.3.7 
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit 873a26697d)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-22 16:17:33 -08:00
Tibor Vass
63277b0aff vendor go-connections to error out if unix socket path is too long 
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit e2e7ab655f)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-22 16:16:24 -08:00
Victor Vieux
a65a2936ac Merge pull request #28676 from aboch/1.13.x-local 
[1.13.x] Vendor libnetwork, netlink and libkv
 2016-11-22 12:07:05 -08:00
Vincent Demeester
9302b0f59c Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719 
This fixes services networks list to be ignored when loading.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 01b70a95c9)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-22 11:27:28 -08:00
Darren Stahl
8ebbeda5a8 Update hcsshim 
Signed-off-by: Darren Stahl <darst@microsoft.com>
(cherry picked from commit baac0ef67f)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-22 11:24:21 -08:00
Brian Goff
fcb64b6e08 re-vendor syslog log driver 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 00caf03132)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-21 14:46:48 -08:00
Alessandro Boch
5c684ba099 Vendoring libkv @1d84310 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-11-21 14:15:33 -08:00
cyli
ba9726350d Include swarmkik dek rotation fixes in re-vendor 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-21 16:43:55 -05:00
Alessandro Boch
a6e1ed7a51 Vendoring libnetwork @dd0ddde 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-11-21 13:20:57 -08:00
Tom Denham
2c832d7d66 Update netlink library (required for libnetwork) 
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
 2016-11-21 11:58:37 -08:00
Vincent Demeester
f44e2dca56 Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit b0903c9db0)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-21 11:48:27 -08:00
Vincent Demeester
cbff9474d2 Merge pull request #28604 from aluzzardi/1.13-swarmkit-revendor 
1.13.x: Re-vendor swarmkit to a2080913b9cf2cac309845a28902896d65d3f527
 2016-11-21 15:09:35 +01:00
Brian Goff
f7ae8204cb Merge pull request #28489 from vieux/1.13.0-rc2-cherrypicks 
1.13.0-rc2 cherry-picks : part 2
 2016-11-20 10:43:55 -05:00
Kenfe-Mickael Laventure
47ccfcc09f Update containerd & runc 
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 8b1aeb22fe)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 15:15:19 -08:00
Nishant Totla
1af49192e4 Updating docker/distribution vendoring 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit d910781c66)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2016-11-18 13:40:06 -08:00
Andrea Luzzardi
0be7359265 1.13.x: Re-vendor swarmkit to a2080913b9cf2cac309845a28902896d65d3f527 
Includes:
- https://github.com/docker/swarmkit/pull/1749
- https://github.com/docker/swarmkit/pull/1753
- https://github.com/docker/swarmkit/pull/1760
- https://github.com/docker/swarmkit/pull/1762
- https://github.com/docker/swarmkit/pull/1764
- https://github.com/docker/swarmkit/pull/1765

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-18 13:39:53 -08:00
Andrea Luzzardi
73bf1ec999 1.13.x: Re-vendor SwarmKit to 577d6bf89a474d3f459804efc5f160ba9fff2b5d 
Includes https://github.com/docker/swarmkit/pull/1746

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-16 18:10:07 -08:00
Andrea Luzzardi
7a457451f6 Revendor swarmkit to 3076318ec0327e22c837c2bfdfacea08124dc755 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-15 19:04:09 -08:00
Tõnis Tiigi
d06b1e2cc2 Merge pull request #28285 from vieux/try_arm_fix_libnetwor 
update libnetwork to fix ARM tests
 2016-11-11 08:32:29 -08:00
Vincent Demeester
bc739a8d70 Update swarmkit to efd44df04cc0fd828de5947263858c3a5a2729b1 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-11 15:18:34 +01:00