Commit Graph

31121 Commits

Author SHA1 Message Date
yuexiao-wang 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
lixiaobing10051267 38b6400e4a It is errNoSuchWatch not errNoSuchPoller in filenotify/poller.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 989e791a42e9dedf7a39b17a877e08caa3a52866
Component: engine
2016-12-26 16:19:50 +08:00
Akihiro Suda 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
allencloud e55475c7b3 split function out of command description scope
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 0b243acbfccddc150d4bb8321d41713a67e039fc
Component: engine
2016-12-26 13:50:00 +08:00
Sebastiaan van Stijn 6bf1e2d028 Minor cleanups in cli/command/container
This change does some minor cleanups in the
cli/command/container package;

- sort imports
- replace `fmt.Fprintf()` with `fmt.Fprintln()` if no formatting is used
- replace `fmt.Errorf()` with `errors.New()` if no formatting is used
- remove some redundant `else`'s

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d5179cb4d48c5c0b6e5b63bcd6e24bb926316f5c
Component: engine
2016-12-26 01:33:25 +01:00
Vincent Demeester 72d129024d Move package cliconfig to cli/config
I felt it made more sence 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ce964a607ad7395af7b74a0ba1efc5ab3cb15790
Component: engine
2016-12-25 20:31:52 +01:00
David Xia 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
Harald Albers 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
Harald Albers 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Vincent Demeester 0de1da63ca Clean some stuff from runconfig that are cli only…
… or could be in `opts` package. Having `runconfig/opts` and `opts`
doesn't really make sense and make it difficult to know where to put
some code.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c424be21b7aa732681ed019b5e547a99fdc2afa5
Component: engine
2016-12-24 13:16:00 +01:00
Vincent Demeester 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
Yanqiang Miao 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
Tonis Tiigi 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
Tonis Tiigi 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
Anusha Ragunathan 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
Anusha Ragunathan 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
Anusha Ragunathan 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
Anusha Ragunathan 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
Sebastiaan van Stijn 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
Brian Goff 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
Victoria Bialas 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
Brian Goff 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
Yong Tang 74f57538fd Support multiple service IDs on "docker service ps"
This fix tries to address issue raised in 25228 to support
multiple service IDs on `docker service ps`.

Multiple IDs are allowed with `docker service ps ...`, and
related documentation has been updated.

A test has been added to cover the changes.

This fix fixes 25228.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 70942352d56779b6c428efa1c2d4cb8a45c1dfa1
Component: engine
2016-12-22 11:33:47 -08:00
Madhu Venugopal 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
Brian Goff 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
Yong Tang 69c28618c2 Sort the build labels passed from build --labels
This fix tries to fix the issue in 29619 where
labels passed from `build --labels` are not sorted.
As a result, if multiple labels have been passed,
each `docker build --labels A=A --labels B=B --labels C=C`
will generate different layers.

This fix fixes the issue by sort the Labels before
they are concatenated to `LABEL ...`.

A unit test has been added to cover the changes

This fix fixes 29619.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d32efdbf8baba891a35c740454624206f41be94a
Component: engine
2016-12-22 07:32:52 -08:00
Sebastiaan van Stijn 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
Zhang Wei 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
Sebastiaan van Stijn 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Akihiro Suda 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
Sebastiaan van Stijn 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
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Ma Shimiao 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
liwenqi 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
Alex 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
Brian Goff 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
Vincent Demeester 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
Vincent Demeester 7056634df4 Move ReplaceOrAppendEnvValues to container package
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7164b66cfc70b43bad98e156e72e305b66aa8ca4
Component: engine
2016-12-21 22:42:39 +01:00
Vincent Demeester 2a01e88f4e Refactor and extract TestRequire functionality
This will help when extracting suites in their own package.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 930a9869f6cb13bcdd44def2d445cb4505f2dd50
Component: engine
2016-12-21 22:39:33 +01:00
Vincent Demeester 2d06f72bfb Make privateRegistryURL (and dockerd) constant
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: be88dd10324d8ecaa13170703c6e250b1c69fe73
Component: engine
2016-12-21 22:34:55 +01:00
Brian Goff 8ec76ebefb Merge pull request #27722 from micro-jumbo/master
Stop returns 0 when docker service was not running
Upstream-commit: 0525a5d72937d012d12704707dbbd80a6a09da38
Component: engine
2016-12-21 16:08:04 -05:00
Vincent Demeester 37cbce62ca Merge pull request #29345 from yuexiao-wang/fix-err-info
Fix incorrect words and formats in image
Upstream-commit: ba1c20f8d64156eb687a2f2e0a140e0a8ef39f10
Component: engine
2016-12-21 21:50:11 +01:00