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
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
78afb2b399
Merge pull request #28670 from cpuguy83/update_syslog_driver
...
re-vendor syslog log driver
Upstream-commit: 9326fb13890714c8003ce8105b53b75d51db54a0
Component: engine
2016-11-21 13:19:47 -08:00
6364691c1f
Update hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: baac0ef67f97e007db03b4edaaa756e4a89678fc
Component: engine
2016-11-21 11:45:32 -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
35302d40a0
Merge pull request #28562 from tomdee/bump-libnetwork
...
Update libnetwork version for IPv6 support
Upstream-commit: 111a95fb500194039cabf670b4cf5b62dcd9ed0e
Component: engine
2016-11-21 11:30:00 -08:00
65ee2f8e99
re-vendor syslog log driver
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 00caf03132a1bf1a2a7a389c5f23d6fc81f2bc0b
Component: engine
2016-11-21 14:24:53 -05:00
86d2b2a2e1
Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
...
Add support for healthcheck in compose to swarm
Upstream-commit: 3739c3bed37a3493a20bff3c9abb17561e1a732d
Component: engine
2016-11-21 10:28:37 +01:00
c0b47669c5
Update netlink library (required for libnetwork)
...
Signed-off-by: Tom Denham <tom@tomdee.co.uk >
Upstream-commit: d96baf28d4e8065212b0404c4048420c7f2c5f78
Component: engine
2016-11-19 16:12:39 -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
c257bd40a6
Merge pull request #28599 from aluzzardi/revendor-swarmkit
...
[master] Revendor SwarmKit to 9bca23b0de42a9ebcc71622a30d646afa1e2b564
Upstream-commit: a0866bd679f3099815d44664f7f53d099c66d426
Component: engine
2016-11-18 16:23:54 -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
5cab628042
Update containerd & runc
...
containerd: 03e5862ec0d8d3b3f750e19fca3ee367e13c090e
runc: 51371867a01c467f08af739783b8beafc15
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 8b1aeb22febdb60e29b4d1ee52c6d4139af1cd62
Component: engine
2016-11-18 08:15:20 -08:00
65faee61a6
Add support for healthcheck in composefile v3
...
`docker stack deploy` now supports a composefile v3 format that have a
healthcheck.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3bd64de7a9c3eecbd57cb11d861a6fe94a5bb788
Component: engine
2016-11-18 15:09:13 +01:00
9b29b94a3c
Update compose-file to bc280351b9589b05c6da031d9f93c5c5d22db922
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b0903c9db0e1fe0226102e3887b5c30474837e97
Component: engine
2016-11-18 15:08:29 +01: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
1eaec61ab6
Update compose-file to 8cff34df885ef07824138236bc4d27d359888b17
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f3dcae7dd36daf85de49af9f86145a9c5f5bd15a
Component: engine
2016-11-11 11:25:57 +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
e297f40024
Merge pull request #28235 from dmcgowan/fix-registry-authorization-errors
...
Fix registry authorization errors
Upstream-commit: 48a0c3e831a13c48a2e64558ff38a79b22881f85
Component: engine
2016-11-10 19:39:28 -08:00
ca36766d89
Merge pull request #27998 from dnephin/compose-on-swarm
...
Support `docker stack deploy` from a Compose file
Upstream-commit: 750d634d62689bf45ecbb4ae34094ad6a5a7fce5
Component: engine
2016-11-10 17:59:57 -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
3baa399d95
Merge pull request #28226 from vieux/exit_exp_plugin
...
move plugins out of experimental
Upstream-commit: acd6e0d9b25c9c8ee4e9a39a69a2a2ac8c1125ec
Component: engine
2016-11-10 17:30:54 -08:00
d19c3e6850
Merge pull request #28229 from darrenstahlmsft/FixUnexpectedResult
...
Fix failure to get containers when deleting a layer
Upstream-commit: d54f4472fdfad1a9c9b04ed2b50ac010556ab44e
Component: engine
2016-11-10 17:10:05 -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
5c8a6f6329
Vendor update hcsshim to v0.5.8
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d0e1949d2280533a57170c9e457ee700fb924ab9
Component: engine
2016-11-10 14:06:57 -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
