Commit graph

90 commits

Author SHA1 Message Date
Vincent Demeester
82dfa6563f Merge pull request #29787 from yongtang/29730-multiple-published-port
Fix issues of multiple published ports mapping to the same target port
2017-01-10 18:49:16 +01:00
Yong Tang
f3a274fa08 Update swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857
This commit updates swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-01-10 03:46:42 -08:00
Vincent Demeester
9c96768eae Merge pull request #29564 from aaronlehmann/getter-types
plugingetter: Avoid all caps for constant declarations
2017-01-10 09:35:19 +01:00
Sebastiaan van Stijn
5f057f6350
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>
2017-01-09 15:05:49 +01:00
Stephen J Day
083ad52f60
vendor: update dependencies for go-digest
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-01-06 18:48:52 -08:00
Alexander Morozov
fad6db4465 Merge pull request #29927 from aaronlehmann/vendor-swarmkit-2e956c4
Revendor swarmkit to 2e956c4
2017-01-06 17:09:21 -08:00
Aaron Lehmann
b1f5320dd6 Revendor swarmkit to 2e956c4
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-05 14:55:52 -08:00
Aaron Lehmann
11df2db538 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>
2017-01-05 14:19:08 -08:00
Aaron Lehmann
428600108c plugingetter: Avoid all caps for constant declarations
Go style calls for mixed caps instead of all caps:
https://golang.org/doc/effective_go.html#mixed-caps

Change LOOKUP, ACQUIRE, and RELEASE to Lookup, Acquire, and Release.

This vendors a fork of libnetwork for now, to deal with a cyclic
dependency issue. The change will be upstream to libnetwork once this is
merged.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-01-04 10:19:04 -08:00
Akihiro Suda
59f6f6bc01 Merge pull request #29852 from thaJeztah/bump-go-units
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
2017-01-04 07:54:45 +09:00
Sebastiaan van Stijn
0e16b5cb3a
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-01-03 18:43:25 +01:00
Madhu Venugopal
d2079a7789 Vendoring libnetwork to bring in isbuiltin changes
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-30 12:26:40 -08:00
Tõnis Tiigi
edaa3c6f07 Merge pull request #29609 from dnephin/add-compose-file-package
Replace the vendored aanand/compose-file with a local copy
2016-12-29 15:12:59 -08:00
Brian Goff
b0aab6e83e Merge pull request #29475 from AkihiroSuda/vendor-oauth2-3
Vendor gcplogs deps
2016-12-28 11:55:03 -05:00
Daniel Nephin
f5af9b9738 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>
2016-12-27 16:17:24 -05:00
Tõnis Tiigi
aecb79ff98 Merge pull request #29339 from dmcgowan/plugins-abstract-download-manager
Abstract layerstore from pull/push distribution code
2016-12-19 13:32:28 -08:00
Derek McGowan
61ac7c4bf8
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>
2016-12-19 10:54:55 -08:00
Akihiro Suda
ff2f875574 vendor: google.golang.org/cloud -> cloud.google.com/go
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-16 08:36:18 +00:00
Akihiro Suda
44b95265df vendor oauth2@96382aa0 and add its deps
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-16 04:37:47 +00:00
Aaron Lehmann
423ba6f223 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-14 17:02:48 -08:00
Madhu Venugopal
8e6969d846 Vendor libnetwork with experimental daemon flag handling
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-12-13 14:22:48 -08:00
Santhosh Manohar
b6b6d3ade4 Vendor libnetwork @4df06c4
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-12-12 00:29:54 -08:00
Yong Tang
3c1c992271 Revendor swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f
This fix updates swarmkit to 5a6df4b07d83e6dbd72e39e354c325dc9b91850f.

This fix is needed by #29074 (docker PR) and is related to
docker/swarmkit#1789 (swarmkit PR) and #29044

This fix may be needed for 1.13.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-09 16:28:51 -08:00
Victor Vieux
ab65ac6bc4 Merge pull request #29233 from aaronlehmann/vendor-swarmkit-5fe1f720
Update vendored swarmkit to 5fe1f720
2016-12-09 14:49:14 -08:00
Victor Vieux
c1a1b381f9 Merge pull request #28459 from dmcgowan/plugin-repository-pinning
Plugin repository pinning
2016-12-08 11:28:52 -08:00
Aaron Lehmann
4441e390d0 Update vendored swarmkit to 5fe1f720
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-12-07 18:06:28 -08:00
Akihiro Suda
7375507eea Vendor swarmkit
Update swarmkit to deec7ba2c4ef48f20ebe9674afbcced606a5339e, from the master branch.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-12-05 04:56:40 +00:00
Madhu Venugopal
8f082e418b Vendoring libnetwork to address some concurrency issues
Addresses #28697, #28845, #28712, #26111

Signed-off-by: Madhu Venugopal <madhu@docker.com>
2016-11-30 09:31:19 -08:00
Andrea Luzzardi
51247185a2 revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-22 17:01:02 -08:00
Anusha Ragunathan
23ea9e45fd Merge pull request #28601 from tiborvass/plugin-misc-fixes
Plugin miscellaneous fixes
2016-11-22 16:12:37 -08:00
Sebastiaan van Stijn
61d9ba930c Merge pull request #28685 from darrenstahlmsft/RevendorGowinio
Revendor go-winio to v0.3.7
2016-11-22 21:35:45 +01:00
Tõnis Tiigi
d1a137b10c Merge pull request #28681 from aboch/vnd
Vendor libkv @ 1d84310
2016-11-22 11:46:22 -08:00
Darren Stahl
873a26697d Revendor go-winio to v0.3.7
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-22 10:39:42 -08:00
Vincent Demeester
01b70a95c9
Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719
This fixes services networks list to be ignored when loading.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-22 13:09:17 +01:00
Sebastiaan van Stijn
fc488328b1 Merge pull request #28671 from darrenstahlmsft/RevendorHcshim
Update hcsshim to v0.5.9
2016-11-22 10:48:20 +01:00
Derek McGowan
d1f5e0f7a6
Update vendor distribution
Distribution client change for class in resource

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-11-21 22:18:41 -08:00
Tibor Vass
e2e7ab655f vendor go-connections to error out if unix socket path is too long
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-11-21 16:34:10 -08:00
Alessandro Boch
f9cff5e267 Vendor libkv @ 1d84310
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-21 14:07:51 -08:00
Alexander Morozov
9bd7189527 Merge pull request #28673 from aboch/vnd
Vendoring libnetwork @dd0ddde
2016-11-21 13:46:14 -08:00
Alexander Morozov
9326fb1389 Merge pull request #28670 from cpuguy83/update_syslog_driver
re-vendor syslog log driver
2016-11-21 13:19:47 -08:00
Darren Stahl
baac0ef67f Update hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-21 11:45:32 -08:00
Alessandro Boch
948c7fdb94 Vendoring libnetwork @dd0ddde
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-21 11:44:58 -08:00
Madhu Venugopal
111a95fb50 Merge pull request #28562 from tomdee/bump-libnetwork
Update libnetwork version for IPv6 support
2016-11-21 11:30:00 -08:00
Brian Goff
00caf03132 re-vendor syslog log driver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-21 14:24:53 -05:00
Vincent Demeester
3739c3bed3 Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
Add support for healthcheck in compose to swarm
2016-11-21 10:28:37 +01:00
Tom Denham
d96baf28d4 Update netlink library (required for libnetwork)
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2016-11-19 16:12:39 -08:00
Tom Denham
5b76fe4a35 Update libnetwork to latest version
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
2016-11-19 16:12:32 -08:00
Victor Vieux
a0866bd679 Merge pull request #28599 from aluzzardi/revendor-swarmkit
[master] Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
2016-11-18 16:23:54 -08:00
Andrea Luzzardi
e35c1747f5 Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2016-11-18 13:32:26 -08:00
Kenfe-Mickael Laventure
8b1aeb22fe Update containerd & runc
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-18 08:15:20 -08:00