a8d9877163
Merge pull request #28304 from ijc25/jsonmessage-use-terminfo
...
use terminfo in pkg/jsonmessage
Upstream-commit: 2c948ac3e6b3b1440c5583cfa9d2c581e96280eb
Component: engine
2017-01-27 09:29:18 -08:00
c0d224023d
Vendoring libnetwork @e8431956
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 03ab20291b255662708b4932df60e7b483dc2b8e
Component: engine
2017-01-26 18:08:18 -08:00
0dedd22a73
Merge pull request #30043 from dmcgowan/distribution-reference-update-1
...
Distribution reference update
Upstream-commit: e9c0de0de65182915d1cd205f06f5c903c20a29f
Component: engine
2017-01-24 20:38:20 -08:00
bb6348df00
Merge pull request #30394 from aboch/nl
...
Vendor vishvananda/netlink @ebdfb74
Upstream-commit: 23341a41a5bada3e6ff151c8f38c5983ff524959
Component: engine
2017-01-24 15:24:07 +01:00
7bd7e5b7ec
Vendor netlink @ebdfb74
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: ed758b604a593b5d4b9d769461d6c44926d89d91
Component: engine
2017-01-23 22:47:37 -08:00
d93ce12d04
Vendor swarmkit, containerd, and related dependencies
...
Update swarmkit to 037b491.
As swarmkit switched to a newer gRPC version, this also involves
updating Docker's vendored gRPC, which in turn requires updating
containerd to a new version that has protobufs generated against this
gRPC version.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 3e987e1732ee5c51e95934afabba3fedfd16c4af
Component: engine
2017-01-23 17:51:14 -08:00
58b37acff7
Merge pull request #30145 from anusha-ragunathan/ps-swarm
...
Pass plugingetter as part of swarm node config.
Upstream-commit: 2b89356c07b1824041985386d0c9485e49d9b987
Component: engine
2017-01-20 10:35:49 -08:00
b4573da32a
Vendor swarmkit
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: eb13865d4e43d3084b017bf2b1287cff5e060b77
Component: engine
2017-01-19 17:20:33 -08:00
35391cbe02
Vendor updated distribution
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 3dfb7590a180f3bbe8ea72b3a437f927ec43e9c4
Component: engine
2017-01-19 16:02:34 -08:00
051c1a4e96
daemon: remove graphdb usage
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b0f9958d932b52b94014eaf4148e6d103573cbfe
Component: engine
2017-01-17 13:52:48 +00:00
b8f872e90b
Merge pull request #29891 from sanimej/libnvendor
...
vendorin libnetwork @f9fa6e0
Upstream-commit: de54284bd7cf4e1c8c255c61d0cf05533f3c2ba4
Component: engine
2017-01-11 19:55:00 +01:00
3e8a509133
vendorin libnetwork @d2edad309cc874e865b5ba4d6bd6b276c93451d3
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: a0dcdcb95f73cd06d3f037f9652a66a5764cb18a
Component: engine
2017-01-10 13:50:16 -08:00
cc8a539fed
Update vendored swarmkit to 62d835f
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: f31ed6cb5bb0888acd83c5ddcd3c0da95dc0719b
Component: engine
2017-01-10 13:00:11 -08:00
59c79fe38f
Merge pull request #29787 from yongtang/29730-multiple-published-port
...
Fix issues of multiple published ports mapping to the same target port
Upstream-commit: 82dfa6563fe78d41eb2f720e1f041f52e02b2a7a
Component: engine
2017-01-10 18:49:16 +01:00
5bf9b5443d
Update swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857
...
This commit updates swarmkit to c97146840a26c9ce8023284d0e9c989586cc1857
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f3a274fa08d70e25b31ba0e0603d14d3b9997c32
Component: engine
2017-01-10 03:46:42 -08:00
b3e47ec408
Merge pull request #29564 from aaronlehmann/getter-types
...
plugingetter: Avoid all caps for constant declarations
Upstream-commit: 9c96768eae4b3a65147b47a55c850c103ab8972d
Component: engine
2017-01-10 09:35:19 +01:00
5932f8db18
vendor: update dependencies for go-digest
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 083ad52f607e83b41e508827c8d502448f606a09
Component: engine
2017-01-06 18:48:52 -08:00
5b11368767
Revendor swarmkit to 2e956c4
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: b1f5320dd6812a34cb4684419f509d17798985b7
Component: engine
2017-01-05 14:55:52 -08:00
8b3646ee75
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 >
Upstream-commit: 428600108cce0a11e65ec4ebd9e439e947b55da7
Component: engine
2017-01-04 10:19:04 -08:00
59c3c898d1
Merge pull request #29852 from thaJeztah/bump-go-units
...
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
Upstream-commit: 59f6f6bc0173a0ffbaac001e07c40de18af9def4
Component: engine
2017-01-04 07:54:45 +09:00
65fe131f80
bump go-units to e30f1e79f3cd72542f2026ceec18d3bd67ab859c
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0e16b5cb3adc16898aae7e1ed532a588b3ef2c95
Component: engine
2017-01-03 18:43:25 +01:00
68566df78e
Vendoring libnetwork to bring in isbuiltin changes
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: d2079a7789f26edc667b9102c25798fdb2c6d3ed
Component: engine
2016-12-30 12:26:40 -08:00
ce228c30e5
Merge pull request #29609 from dnephin/add-compose-file-package
...
Replace the vendored aanand/compose-file with a local copy
Upstream-commit: edaa3c6f07385f0c08bc62811508c56d821e696f
Component: engine
2016-12-29 15:12:59 -08:00
1b913d2b2c
Merge pull request #29475 from AkihiroSuda/vendor-oauth2-3
...
Vendor gcplogs deps
Upstream-commit: b0aab6e83e9d0235fef99b16a45fd2680995168f
Component: engine
2016-12-28 11:55:03 -05:00
edfbbc6ec9
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 >
Upstream-commit: f5af9b9738892b5988f987ce5fbce6e31a10e768
Component: engine
2016-12-27 16:17:24 -05:00
5aa0397464
Add deps to test compose-file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 32425d3add046ed2157c4bb36a3b5f2c2402c446
Component: engine
2016-12-27 16:17:24 -05:00
ae0f2c64b3
Merge pull request #29339 from dmcgowan/plugins-abstract-download-manager
...
Abstract layerstore from pull/push distribution code
Upstream-commit: aecb79ff9866ec6b3536c50608706d2d4a6325df
Component: engine
2016-12-19 13:32:28 -08:00
27d800b3f4
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 >
Upstream-commit: 61ac7c4bf8336ff7308d2693bdafd3667690aa97
Component: engine
2016-12-19 10:54:55 -08:00
729e9d0578
vendor: google.golang.org/cloud -> cloud.google.com/go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: ff2f8755741a3c5bdd29bab9c36985c6d05d531a
Component: engine
2016-12-16 08:36:18 +00:00
8692893416
vendor oauth2@96382aa0 and add its deps
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 44b95265df5c8d0106479cc370de5e0f51974483
Component: engine
2016-12-16 04:37:47 +00:00
e1affcf1a8
Revendor swarmkit
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 423ba6f223ac167fd84b96eebd94679e4ec8e52c
Component: engine
2016-12-14 17:02:48 -08:00
9125d5e539
Vendor libnetwork with experimental daemon flag handling
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 8e6969d846830d7f56d7070956fba88e9c8848ed
Component: engine
2016-12-13 14:22:48 -08:00
7bffefb067
Vendor libnetwork @4df06c4
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: b6b6d3ade4160bada2cff227e1da109af7a9834f
Component: engine
2016-12-12 00:29:54 -08:00
996e12afa9
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 >
Upstream-commit: 3c1c992271800b3ba948482d2e8c2c41d765a906
Component: engine
2016-12-09 16:28:51 -08:00
21831612fd
Merge pull request #29233 from aaronlehmann/vendor-swarmkit-5fe1f720
...
Update vendored swarmkit to 5fe1f720
Upstream-commit: ab65ac6bc4fad18321d7759ca309b0296aa1120d
Component: engine
2016-12-09 14:49:14 -08:00
aacf384e2f
Merge pull request #28459 from dmcgowan/plugin-repository-pinning
...
Plugin repository pinning
Upstream-commit: c1a1b381f91367afa94a69649d9aa808acecc8ac
Component: engine
2016-12-08 11:28:52 -08:00
52a085e061
Update vendored swarmkit to 5fe1f720
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 4441e390d0347a5182677628d8ff901156f95fff
Component: engine
2016-12-07 18:06:28 -08:00
f6ae1b2ad9
Vendor swarmkit
...
Update swarmkit to deec7ba2c4ef48f20ebe9674afbcced606a5339e, from the master branch.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 7375507eeae61cfb5e93f074235320687595b07d
Component: engine
2016-12-05 04:56:40 +00:00
f823abf46f
Vendoring libnetwork to address some concurrency issues
...
Addresses #28697 , #28845 , #28712 , #26111
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 8f082e418ba662eb700a3a9343371fa6d9c28d5a
Component: engine
2016-11-30 09:31:19 -08:00
a8959c0a37
revendor swarmkit to 53fcdeba083627b1a2616612a103019b73c6d5ce
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 51247185a2c53854163276404a3438c9eb38c3b5
Component: engine
2016-11-22 17:01:02 -08:00
e746d79ff3
Merge pull request #28601 from tiborvass/plugin-misc-fixes
...
Plugin miscellaneous fixes
Upstream-commit: 23ea9e45fd6281e82c389e6112457a7bb70f8d89
Component: engine
2016-11-22 16:12:37 -08:00
2b83a1645f
Merge pull request #28685 from darrenstahlmsft/RevendorGowinio
...
Revendor go-winio to v0.3.7
Upstream-commit: 61d9ba930ccf13a39d56f922798695819d239683
Component: engine
2016-11-22 21:35:45 +01:00
f8ede66132
Merge pull request #28681 from aboch/vnd
...
Vendor libkv @ 1d84310
Upstream-commit: d1a137b10ce9755da58b550256b067a414053552
Component: engine
2016-11-22 11:46:22 -08:00
80569cdfd8
Revendor go-winio to v0.3.7
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 873a26697de8e1dfdc31c7151a7c4fdfd30f519a
Component: engine
2016-11-22 10:39:42 -08:00
ec58146d37
Update aanand/compose-file to a3e58764f50597b6217fec07e9bff7225c4a1719
...
This fixes services networks list to be ignored when loading.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 01b70a95c93b8442276fd312bac44a45ec859460
Component: engine
2016-11-22 13:09:17 +01:00
1f31dcb95c
Merge pull request #28671 from darrenstahlmsft/RevendorHcshim
...
Update hcsshim to v0.5.9
Upstream-commit: fc488328b1f97165d2b80944a8f9887ae7268194
Component: engine
2016-11-22 10:48:20 +01:00
e60b86d1ae
Update vendor distribution
...
Distribution client change for class in resource
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: d1f5e0f7a68d8a43931b834ce342830956bdac32
Component: engine
2016-11-21 22:18:41 -08:00
0ef1fc07ad
vendor go-connections to error out if unix socket path is too long
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: e2e7ab655fa429d491096eea82952c4a6a1569d9
Component: engine
2016-11-21 16:34:10 -08:00
780b0ff3be
Vendor libkv @ 1d84310
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: f9cff5e267b5e6eb9046286e8a4e43552da605eb
Component: engine
2016-11-21 14:07:51 -08:00
424f2463fd
Merge pull request #28673 from aboch/vnd
...
Vendoring libnetwork @dd0ddde
Upstream-commit: 9bd7189527a35829f4dd8e3eb630f570b466801f
Component: engine
2016-11-21 13:46:14 -08:00
