Commit Graph

40 Commits

Author SHA1 Message Date
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
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
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
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
7c7f67d5d1 Vendoring libnetwork @dd0ddde
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 948c7fdb943e89d7e08960eefb6ed030a0bab639
Component: engine
2016-11-21 11:44:58 -08:00
12f8b31660 Update libnetwork to latest version
Signed-off-by: Tom Denham <tom@tomdee.co.uk>
Upstream-commit: 5b76fe4a35adac2467658cbc5a2b26469d75f8ca
Component: engine
2016-11-19 16:12:32 -08:00
b72665f309 Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: e35c1747f5ebd36ba9d35ded5613e4e4762645d4
Component: engine
2016-11-18 13:32:26 -08:00
01fd03f430 Re-vendor SwarmKit to 91c6e2db9c0c91c466a83529ed16649a1de7ccc4
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: fbe87907597dcea5a5ac493689556873b16a809f
Component: engine
2016-11-16 18:15:15 -08:00
cd8c39a1d4 Updating docker/distribution vendoring
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: d910781c66262af95646d7a0b564d254afc4af8f
Component: engine
2016-11-14 15:31:25 -08:00
4a96d47119 Merge pull request #28285 from vieux/try_arm_fix_libnetwor
update libnetwork to fix ARM tests
Upstream-commit: d06b1e2cc2fbeec4316885d0f403c96dd34b89d7
Component: engine
2016-11-11 08:32:29 -08:00
45eb178352 Update swarmkit to efd44df04cc0fd828de5947263858c3a5a2729b1
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: bc739a8d70044263b1b71c28b8465fe2c84d3262
Component: engine
2016-11-11 15:18:34 +01:00
87324db99d fix ARM unsafe access
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 84264e9461e11ee2884830df0768eaea662c5cc9
Component: engine
2016-11-10 23:55:38 -08:00
5c38fc2991 Update distribution vendor
Pull in client changes to handle oauth errors

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 60ecc132c538129e7093dd38987291651e418035
Component: engine
2016-11-10 17:34:12 -08:00
b0b2a12b08 update media_type
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 970b23db2e97e1671c6bf4b57bfe5d1a30e98819
Component: engine
2016-11-10 15:51:32 -08:00
b8314489b1 Merge pull request #28257 from sanimej/iptables
vendor libnetwork @1861587
Upstream-commit: f700a86dc01ef65061a695cc8e0694afaff8b334
Component: engine
2016-11-10 14:01:02 -08:00
8c6719d015 vendor libnetwork @1861587
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 90bc2756ed2693ff26f0517abbb060626d9a7284
Component: engine
2016-11-10 12:04:28 -08:00
e2a7e2f897 Vendor the latest swarmkit PR
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: b399d29a57dad9c9fe14bf07431eb57a9ef0d2ac
Component: engine
2016-11-10 11:53:02 -08:00
cf52bc83b2 Vendoring latest swarmkit and libnetwork
Signed-off-by: Sandeep Bansal <msabansal@microsoft.com>
Upstream-commit: 6e951656792bb3cad17d579a628b333cebcad3e7
Component: engine
2016-11-10 09:54:47 -08:00
1e77cc5379 vendor: update swarmkit to bddd3f0
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 2a68f0f0016caa6cef8d32726002b9ad02a4c56c
Component: engine
2016-11-09 16:08:52 -08:00
174f2a0d72 Merge pull request #28025 from vdemeester/swarm-mode-templating
Add support for swarm mode templating
Upstream-commit: 8ffd1a370c447db92a67d17f900ccd453dbcedee
Component: engine
2016-11-09 15:57:52 -08:00
9549c6b9d6 Add support for swarm mode templating
Wire templating support of swarmkit for the engine, in order to be used
through services.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6212ea669b4e92b3aa3985857f827ee9b95271fd
Component: engine
2016-11-09 23:28:06 +01:00
6f6d63afeb Update swarmkit to 00890359d8bfba630824b66b848dbf7851149fef
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6e885540a208fe555e3b746d136c84f76e988f8a
Component: engine
2016-11-09 22:38:24 +01:00
5431f2d3ce secrets: vendor swarmkit
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

secrets: vendor swarmkit

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
Upstream-commit: 1310dadf4ab3f38b346d78a6cbc7dae045388013
Component: engine
2016-11-09 14:27:43 -05:00
22b4540407 Revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0
This fix revendor swarmkit to 29950a4e9912178cadb72abc5a445e3a857cb2b0.

This fix is related to 28031.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f0e2eb24cfb6b1e888a93acc971386130e7e99ba
Component: engine
2016-11-07 17:57:20 -08:00
b91cea3478 Vendor libnetwork a98901aebe7ce920b6fbf02ebe5c3afc9ca975b8.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: aba4190612a2e4f0400e0e992de81aa382299f9b
Component: engine
2016-11-04 21:50:56 -07:00
fc88fcd016 Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 014eeb539beaf84c69dc2a97b8ffd32551219d0e
Component: engine
2016-11-04 12:26:37 -07:00
61646d77af project: use vndr for vendoring
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f2614f2107c838d014d31b806e3b8a9f1395cb2b
Component: engine
2016-11-03 15:31:46 -07:00