c7bd985ccb
Merge pull request #29707 from gesellix/delete-plugin-swagger
...
fix swagger description for `DELETE /plugin/{name}`
Upstream-commit: 55d5c80214481299a1627a3bb2e32c4c1e358700
Component: engine
2016-12-27 12:24:51 +01:00
44db4994e4
Merge pull request #29648 from yuexiao-wang/fix-man-docker
...
Update the manuals of docker and dockerd
Upstream-commit: e3000a4e2f24a061d54cf135196a72c8d767a9a0
Component: engine
2016-12-27 12:13:20 +01:00
5d4d6d04ad
Merge pull request #29699 from yuexiao-wang/update-index
...
Update the index of docker command line
Upstream-commit: af843c53f88c14fc494553a42ef45fb7937f13dc
Component: engine
2016-12-27 11:26:50 +01:00
a8c2e6aae2
Update the index of docker command line
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: f649f54c60aee1a88c40b5c8c635c381f324b5a7
Component: engine
2016-12-28 02:39:04 +08:00
d3fb58de2f
Merge pull request #29705 from allencloud/rename-clusterProvider-to-cluster
...
rename clusterProvider to cluster in router
Upstream-commit: 1474bf6c6e830e3300ac37fb630d1a0d8841d4bf
Component: engine
2016-12-27 09:34:17 +01:00
71e3564b45
Merge pull request #29690 from albers/completion-plugin-install--alias
...
Add bash completion for `plugin install --alias`
Upstream-commit: b81f47a288bcc28d1fe0f6fb4f79636074dbf67c
Component: engine
2016-12-26 18:42:54 -08:00
24535638bb
fix swagger description for DELETE /plugin/{name}
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: e6b2829a7f59b59eb1c3653313bc3c6a56b47b0c
Component: engine
2016-12-26 15:27:59 +01:00
59db12afbb
rename clusterProvider to cluster in router
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0238e9e92bd8a2bdc805578b18bc342b1c482a85
Component: engine
2016-12-26 20:53:13 +08:00
58405ddf68
Merge pull request #29681 from tonistiigi/fix-invalid-inspect
...
Fix inspect object by invalid reference
Upstream-commit: 11eb9b0d268910bfa51d7669f652f7c49fe350cd
Component: engine
2016-12-26 13:09:32 +01:00
555eaa232b
Update the manuals of docker and dockerd
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b3e14c25f2926bde61ead09cbe40fd549f76ab75
Component: engine
2016-12-26 18:22:31 +08:00
b9f88bc408
Merge pull request #29691 from albers/completion-service-create-cleanup
...
Cleanup bash completion for `service create|update`
Upstream-commit: 7d8a9b9234eb36e7e8ac9cc825b1f52d76f31e2b
Component: engine
2016-12-26 14:56:54 +09:00
7cf6d504ef
Merge pull request #29693 from davidxia/fix-typo
...
Fix typo in docs
Upstream-commit: fb03b56b9b81182ef8561c57e2e7626658dc943b
Component: engine
2016-12-26 10:45:00 +09:00
5c56c3f06a
Fix typo in docs
...
s/BlkioDeviceWiiteIOps/BlkioDeviceWriteIOps/g
Signed-off-by: David Xia <dxia@spotify.com >
Upstream-commit: f394b1d77614d33e85c93ecb10f0a6676538b2e7
Component: engine
2016-12-25 11:48:11 -05:00
f3ee15ca0a
Cleanup bash completion for service create|update
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d5935f83a7db0b2e77afb76a9111066dd7cd8f94
Component: engine
2016-12-25 06:04:43 -08:00
d94b689fed
Add bash completion for plugin install --alias
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 83158f8aff3ec01fa027556c48e364c5311a6839
Component: engine
2016-12-25 05:32:50 -08:00
f3b013aeac
Merge pull request #29682 from miaoyq/add-volume-prune-to-index
...
Add 'volume prune' to the volume commands index
Upstream-commit: e6366743a145a22bdb5c1fbaa31aad0061c61d19
Component: engine
2016-12-24 20:21:31 +01:00
9a90eb8b59
Merge pull request #29656 from AkihiroSuda/fix-poule
...
poule: do not recognize "arm" as platform/arm
Upstream-commit: cc439b8844b80163671efada95aa235f78724501
Component: engine
2016-12-24 19:59:20 +01:00
f56b7023bb
Merge pull request #28623 from cpuguy83/update_graphdriver_docs
...
Ensure graphdriver only loads with experimental flag
Upstream-commit: d3e3a97cb2b3d86587ae52e3d8247dc2ba4d2c4e
Component: engine
2016-12-24 11:59:24 +01:00
aec6773f9f
Add 'volume prune' to the volume commands index
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 3d4ea98971d319e9dbbeefbd1e82a9c0feae8c70
Component: engine
2016-12-24 15:03:38 +08:00
396314b106
Fix inspect object by invalid reference
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 3cd39aaeab37102e4b12decc0c36042e477e2fa6
Component: engine
2016-12-23 22:57:30 -08:00
10cdae676f
Merge pull request #29487 from tonistiigi/plugins-rework
...
Plugins content addressability
Upstream-commit: a9fa38b1edf30b23cae3eade0be48b3d4b1de14b
Component: engine
2016-12-23 20:01:04 -08:00
478844dff8
Implement content addressability for plugins
...
Move plugins to shared distribution stack with images.
Create immutable plugin config that matches schema2 requirements.
Ensure data being pushed is same as pulled/created.
Store distribution artifacts in a blobstore.
Run init layer setup for every plugin start.
Fix breakouts from unsafe file accesses.
Add support for `docker plugin install --alias`
Uses normalized references for default names to avoid collisions when using default hosts/tags.
Some refactoring of the plugin manager to support the change, like removing the singleton manager and adding manager config struct.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 3d86b0c79b16334ce5836c0315e4c310b84c2e17
Component: engine
2016-12-23 13:29:58 -08:00
e6fc7a5576
Merge pull request #29599 from anusha-ragunathan/refcount
...
Enforce zero plugin refcount during disable, not remove.
Upstream-commit: d1dfc1a5ef95dc5621a07915f9786199442043c7
Component: engine
2016-12-22 15:38:54 -08:00
ba9d83b3bc
Merge pull request #29664 from cpuguy83/fix_bolt_usage
...
Fix usage of boltdb in volume restore
Upstream-commit: d25186a625ca94ec1d4a814dd8745fd3ca335caa
Component: engine
2016-12-22 13:53:04 -08:00
96266c77ea
Merge pull request #29665 from mavenugo/getall
...
Add a GetAll function that returns only managed plugins supported by V2
Upstream-commit: e4512d264741e83e954a19f9ef5e3cb06c5856b6
Component: engine
2016-12-22 13:30:28 -08:00
9eac558235
Enforce zero plugin refcount during disable.
...
When plugins have a positive refcount, they were not allowed to be
removed. However, plugins could still be disabled when volumes
referenced it and containers using them were running.
This change fixes that by enforcing plugin refcount during disable.
A "force" disable option is also added to ignore reference refcounting.
Signed-off-by: Anusha Ragunathan <anusha@docker.com >
Upstream-commit: 8cb2229cd18c53bdbf36301f26db565a50027d6a
Component: engine
2016-12-22 13:26:53 -08:00
7218cd6b9a
Merge pull request #29615 from londoncalling/docs-glossary-followup-PR#29561
...
followup to incorporate review comments per previous reviews on PR#29561
Upstream-commit: b39b0c4596d424cd98856fb633183f30807ad0a2
Component: engine
2016-12-22 21:50:58 +01:00
09a9069bac
Merge pull request #29628 from liliVicky/my-feature4
...
modify some errors of plurality
Upstream-commit: 748a9a3f9cb804576a5fb58d11608d759160b3da
Component: engine
2016-12-22 15:40:30 -05:00
92f01ccff3
followup to incorporate review comments per previous reviews on PR#29561
...
incorporated review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 15a21ef1bdc2e833bc4c9d6b9919486dd0589457
Component: engine
2016-12-22 12:30:53 -08:00
38849b2667
Moves graphdriver plugn docs out of experimental
...
Also updates some of the structures being sent so plugins are getting
all the new options.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 677fa03654886ee776ff478c30681d5376cfc196
Component: engine
2016-12-22 15:30:25 -05:00
efaab09327
Add a GetAll function that returns only managed plugins supported by V2
...
The current GetAll handles both V2 and legacy plugins. Also due to the
nature of V1 plugins, it also loads them. This causes problems when
loading is not required. Hence adding an independent API that will
return only the plugins that are loaded using v2 mangaed plugins.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 8f1b793528e01004e4a40fe4ef835e235282b2f4
Component: engine
2016-12-22 10:26:04 -08:00
4d0b32f2ac
Fix usage of boltdb in volume restore
...
bolt k/v pairs are only valid for the life of a transaction.
This means the memory that the k/v pair is referencing may be invalid if
it is accessed outside of the transaction.
This can potentially cause a panic.
For reference: https://godoc.org/github.com/boltdb/bolt#hdr-Caveats
To fix this issue, unmarshal the stored data into volume meta before
closing the transaction.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 4876a9047ebfd66294d88482a1b4b24634a632e6
Component: engine
2016-12-22 11:56:02 -05:00
5ef85a095b
Merge pull request #29500 from WeiZhang555/add-missing-flag
...
Add missing "--default-runtime" flag in manpage
Upstream-commit: a8bcef6fddb21e7edcf1050631dfd8e6491297ae
Component: engine
2016-12-22 16:22:53 +01:00
32a699cc17
Add missing "--default-runtime" flag in manpage
...
Add missing flag and more descriptions in manpage.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 977fd439857006ab34deebac384b621bf4dae7da
Component: engine
2016-12-22 23:00:40 +08:00
433a6ae35a
Merge pull request #29314 from vdemeester/no-more-utils
...
Remove the utils package
Upstream-commit: b9ee31ae027bbd62477fea3f58023c90f051db00
Component: engine
2016-12-22 15:21:05 +01:00
1e12b9ad9a
Merge pull request #29600 from allencloud/update-docs-about-service-update
...
update service update in docs
Upstream-commit: 524704143b1f27650db9debe22adb9cf1e583930
Component: engine
2016-12-22 15:17:51 +01:00
a961c58e58
Merge pull request #29603 from mstanleyjones/docker_diff_improvements
...
Clarify what docker diff shows
Upstream-commit: 0ca3e84227a04c0c6256f55b92e9205bd1ca9309
Component: engine
2016-12-22 15:15:01 +01:00
16e5c73977
Merge pull request #29532 from yuexiao-wang/add-link-swarm
...
Add the link for swarm reference document
Upstream-commit: b47cb6095dab3691d8838e46c92cc9ec22a75f05
Component: engine
2016-12-22 15:13:47 +01:00
194c3ebac2
Merge pull request #29565 from yuexiao-wang/fix-typo-tls
...
Change tls to TLS
Upstream-commit: 8f9a48ab5a57b33e99a5231a1ea966cd3910373e
Component: engine
2016-12-22 12:10:09 +01:00
756acd9fc7
poule: do not recognize "arm" as platform/arm
...
Some words such as "swarm" and "apparmor" were recognized as "arm".
So remove "arm" from the list at the moment.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: b7ca1568b157b7a67951207626a6605bcee4e282
Component: engine
2016-12-22 10:35:10 +00:00
e214f9bff5
Merge pull request #29399 from Mashimiao/oci-namespace-remove-idx
...
oci/namespace: remove unnecessary variable idx
Upstream-commit: d34e8469606bb4ba1416b0790d4d7641de9d66f9
Component: engine
2016-12-22 10:50:06 +01:00
8c06810847
Merge pull request #29483 from vdemeester/extract-and-refactor-requirement
...
[test-integration] Refactor and extract TestRequire functionality
Upstream-commit: f847a3b7ceb00e81617e5219e1dc5c08777f6481
Component: engine
2016-12-22 10:24:51 +01:00
95815b8282
Merge pull request #29536 from vdemeester/integration-privateRegistryURL-const
...
[test-integration] Make privateRegistryURL (and dockerd) constant
Upstream-commit: 9b5484e8c7c6688e654a553c326d7a8761c4faf1
Component: engine
2016-12-22 10:23:35 +01:00
d278ea531e
Merge pull request #29605 from cpuguy83/fix_container_list
...
Refactor cleanup of paused test containers
Upstream-commit: 6b94be3521290a791a641df2528def86925ba6ff
Component: engine
2016-12-22 10:22:58 +01:00
218e86f3fa
Merge pull request #29645 from alexellis/label_arm_issues
...
Label ARM issues through Poule #29644
Upstream-commit: 176ef97a985f8b03ef2326d4e178918b1bcfd38e
Component: engine
2016-12-22 10:21:08 +01:00
c024300dfe
oci/namespace: remove unnecessary variable idx
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 730e0994c8ceec64e753562c648e57e0a7ead6b4
Component: engine
2016-12-22 09:08:43 +08:00
409b30fc55
modify some files
...
Signed-off-by: liwenqi <vikilwq@zju.edu.cn >
update some files in the folder of distribution/xfer
Signed-off-by: liwenqi <vikilwq@zju.edu.cn >
correct again
Signed-off-by: liwenqi <vikilwq@zju.edu.cn >
Upstream-commit: 128d07d3493aeee8ec6a044039f032aeb2adf699
Component: engine
2016-12-22 08:38:37 +08:00
712fe64d1b
Label ARM issues through Poule #29644
...
Signed-off-by: Alex <alexellis2@gmail.com >
Upstream-commit: ef15b217eac84131cec1ee03b4f41f43c418df41
Component: engine
2016-12-21 23:46:48 +00:00
23f7d46551
Merge pull request #29606 from albers/completion-plugins-bundled
...
Improve bash completion for bundled plugins
Upstream-commit: 76b4f5ac28a804d26f0dbe4e966ee6360c1a625e
Component: engine
2016-12-21 17:12:27 -05:00
36a05ce983
Move names to package api
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: dba271a42ab4841dbcf2e953491e9ee728cd8e16
Component: engine
2016-12-21 22:42:47 +01:00
