Commit Graph

29795 Commits

Author SHA1 Message Date
1ba9a6e736 Merge pull request #29709 from allencloud/fix-29708-more-correct-error-message
return more accurate error message when docker kill
Upstream-commit: 3702ee13bcb61ca72e63b2d177e756fd8ad1042f
Component: engine
2016-12-27 13:06:44 +01:00
6ae133987d Merge pull request #29703 from allencloud/make-pkg-system-support-darwin
make more package in system support darwin
Upstream-commit: 398ac2a884a42d6ba0a40260f47b2f18dfa422ac
Component: engine
2016-12-27 13:01:13 +01:00
9c5810cac4 use https clone url for docker/docker in ARM.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: cddd28817001bc07104bf7f3481b6e74fd43caa9
Component: engine
2016-12-27 19:51:45 +08:00
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
8a1df96ade Update docker daemon to dockerd
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 62cc802f6160b7fbb506f5307d96a564cbfb5f1f
Component: engine
2016-12-27 17:32:15 +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
b718dea1c9 return more accurate error message when docker kill
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: cf5734b2e16978b7ae224de566a7c21020c88a78
Component: engine
2016-12-27 13:38:13 +08:00
a7d9e53a66 display network name when disconnecting network error
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: f0844de8f00eef8fe42503986a87933516b11b46
Component: engine
2016-12-27 13:37:54 +08:00
4fcf2cd7b7 Fix image's CMD after WORKDIR in Dockerfile
This fix tries to fix 29667 where image's `CMD` is modified
after `WORKDIR` in Dockerfile.

The value of `b.runConfig.Cmd` was modified in the processing
of `WORKDIR`, in order to fix 28902. However, the same
`b.runConfig.Cmd` is passed to `commit()`.

This fix restored the `b.runConfig.Cmd` before `commit()`
the image for `WORKDIR`.

A test has been added.

This fix fixes 29667.

This fix is related to 28902, 28909, 28514.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 083602384737635af9a89b75a6ca6d27f7515dc6
Component: engine
2016-12-26 20:43:29 -08:00
98d422fce0 Move UAStringKey to dockerversion pkg
Removes grpc dependency from client

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 64981b9f095459ae65954ca80a86c8f4a735ef24
Component: engine
2016-12-26 18:53:22 -08:00
42b7611762 Move imageID validation to stringid pkg
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9f3046f9a03f1a710bdb7fcddd37ff50e71e31c3
Component: engine
2016-12-26 18:53:22 -08:00
8fc615e678 Move builder cli helper functions to own pkg
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: feaf5902f650f2326e1c41e82dfe28962f1ba46e
Component: engine
2016-12-26 18:53:22 -08:00
1c2e3ffc9c Define PushResult in api types
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 13222160e84a01db2174c0dbf3000761a756fd72
Component: engine
2016-12-26 18:53:22 -08: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
98d0c42181 Remove docker stack ps -a to match removal of docker service/node ps -a
In #28507 and #28885, `docker service/node ps -a` has been removed so that
information about slots are show up even without `-a` flag.

The output of `docker stack ps` reused the same output as `docker service/node ps`.
However, the `-a` was still there. It might make sense to remove `docker stack ps -a`
as well to bring consistency with `docker service/node ps`.

This fix is related to #28507, #28885, and #25983.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9155e14e77a8235791a6de752f6f43e83308e23d
Component: engine
2016-12-26 13:47:43 -08:00
0ff4595d80 Display only the name of the requirement…
… relative to the integration-cli package

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 952c8aef3f221ee266627c26b9d8e4c0d936258f
Component: engine
2016-12-26 21:29:17 +01:00
c2f39444f3 Update 'ID' field for 'docker plugin ls'
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 1e6587ff280dc3dcac405a67af2ddfd83c78f983
Component: engine
2016-12-27 02:17:35 +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
0f7668087b make more package in system support darwin
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: c6dc4f85abd3b9722bf34265366e21cc7675623b
Component: engine
2016-12-26 21:30:06 +08: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
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
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
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
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
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
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
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
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
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
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
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