Commit graph

30016 commits

Author SHA1 Message Date
Brian Goff
a412c1b7a0 Merge pull request #29668 from dmcgowan/plugins-dct
Support Docker Content Trust for plugins
2016-12-28 10:43:32 -05:00
Doug Davis
9fab262690 Merge pull request #29752 from allencloud/fix-nits-in-comments
fix nits in comments
2016-12-28 08:33:48 -05:00
Sebastiaan van Stijn
01c62d6e54 Merge pull request #29744 from yuexiao-wang/update-docker-ps
Update the field 'CONTAINER ID' for docker ps
2016-12-28 11:46:06 +01:00
yuexiao-wang
b3faa7755a Update the field 'CONTAINER ID' for docker ps
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-29 02:00:31 +08:00
Sebastiaan van Stijn
38178cda41 Merge pull request #29696 from zhenghenghuo/branch-two
fix some typos
2016-12-28 08:05:43 +01:00
zhenghenghuo
f1a19fa8c0 fix some typos
Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>

try to pass the test

Signed-off-by: zhenghenghuo <zhenghenghuo@zju.edu.cn>
2016-12-28 09:43:27 +08:00
Derek McGowan
14e8bba4f5
Support for docker content trust for plugins
Add integration test for docker content trust

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-12-27 12:51:00 -08:00
Brian Goff
bf6eb85539 Merge pull request #29666 from tonistiigi/client-deps
Clean up client binary dependencies
2016-12-27 15:01:24 -05:00
Sebastiaan van Stijn
823718c3b4 Merge pull request #29701 from yuexiao-wang/add-field
Update 'ID' field for 'docker plugin ls'
2016-12-27 20:04:28 +01:00
Brian Goff
efbb23f3e6 Merge pull request #29716 from yongtang/28885-docker-stack-ps-all
Remove `docker stack ps -a` to match removal of `docker service/node ps -a`
2016-12-27 13:56:01 -05:00
Alexander Morozov
e3f61bd254 Merge pull request #29694 from lixiaobing10051267/masterFileNodify2
It is errNoSuchWatch not errNoSuchPoller in filenotify/poller.go
2016-12-27 09:04:34 -08:00
allencloud
6fb05778ba fix nits in comments
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-27 23:30:50 +08:00
Vincent Demeester
592f9891d4 Merge pull request #29725 from yuexiao-wang/remove-redundant-var
Remove unused variable
2016-12-27 16:05:43 +01:00
yuexiao-wang
08c6575caf Remove unused variable
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-28 03:20:41 +08:00
Justin Cormack
9f60ae538b Merge pull request #29720 from lixiaobing10051267/masterArmClone
use https clone url for docker/docker in ARM.md
2016-12-27 14:05:15 +00:00
Sebastiaan van Stijn
7a339eb4e9 Merge pull request #28692 from allencloud/splict-function-out-of-command-denifition-scope
refactor code to split function out of command definition scope
2016-12-27 13:48:12 +01:00
Vincent Demeester
e7d4269a50 Merge pull request #29714 from vdemeester/small-requirement-fix
Display only the name of the requirement…
2016-12-27 13:21:43 +01:00
Sebastiaan van Stijn
16500dfb1d Merge pull request #29712 from allencloud/add-network-name-when-disconnecting-error
display network name when disconnecting network error
2016-12-27 13:08:07 +01:00
Sebastiaan van Stijn
3702ee13bc Merge pull request #29709 from allencloud/fix-29708-more-correct-error-message
return more accurate error message when docker kill
2016-12-27 13:06:44 +01:00
Sebastiaan van Stijn
398ac2a884 Merge pull request #29703 from allencloud/make-pkg-system-support-darwin
make more package in system support darwin
2016-12-27 13:01:13 +01:00
lixiaobing10051267
cddd288170 use https clone url for docker/docker in ARM.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-27 19:51:45 +08:00
Sebastiaan van Stijn
55d5c80214 Merge pull request #29707 from gesellix/delete-plugin-swagger
fix swagger description for `DELETE /plugin/{name}`
2016-12-27 12:24:51 +01:00
Sebastiaan van Stijn
e3000a4e2f Merge pull request #29648 from yuexiao-wang/fix-man-docker
Update the manuals of docker and dockerd
2016-12-27 12:13:20 +01:00
Vincent Demeester
af843c53f8 Merge pull request #29699 from yuexiao-wang/update-index
Update the index of docker command line
2016-12-27 11:26:50 +01:00
yuexiao-wang
f649f54c60 Update the index of docker command line
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-28 02:39:04 +08:00
Vincent Demeester
1474bf6c6e Merge pull request #29705 from allencloud/rename-clusterProvider-to-cluster
rename clusterProvider to cluster in router
2016-12-27 09:34:17 +01:00
allencloud
cf5734b2e1 return more accurate error message when docker kill
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-27 13:38:13 +08:00
allencloud
f0844de8f0 display network name when disconnecting network error
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-27 13:37:54 +08:00
Tonis Tiigi
64981b9f09 Move UAStringKey to dockerversion pkg
Removes grpc dependency from client

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-12-26 18:53:22 -08:00
Tonis Tiigi
9f3046f9a0 Move imageID validation to stringid pkg
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-12-26 18:53:22 -08:00
Tonis Tiigi
feaf5902f6 Move builder cli helper functions to own pkg
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-12-26 18:53:22 -08:00
Tonis Tiigi
13222160e8 Define PushResult in api types
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-12-26 18:53:22 -08:00
Tõnis Tiigi
b81f47a288 Merge pull request #29690 from albers/completion-plugin-install--alias
Add bash completion for `plugin install --alias`
2016-12-26 18:42:54 -08:00
Yong Tang
9155e14e77 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>
2016-12-26 13:47:43 -08:00
Vincent Demeester
952c8aef3f
Display only the name of the requirement…
… relative to the integration-cli package

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-12-26 21:29:17 +01:00
yuexiao-wang
1e6587ff28 Update 'ID' field for 'docker plugin ls'
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-27 02:17:35 +08:00
Tobias Gesellchen
e6b2829a7f fix swagger description for DELETE /plugin/{name}
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
2016-12-26 15:27:59 +01:00
allencloud
c6dc4f85ab make more package in system support darwin
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-26 21:30:06 +08:00
allencloud
0238e9e92b rename clusterProvider to cluster in router
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-26 20:53:13 +08:00
Vincent Demeester
11eb9b0d26 Merge pull request #29681 from tonistiigi/fix-invalid-inspect
Fix inspect object by invalid reference
2016-12-26 13:09:32 +01:00
yuexiao-wang
b3e14c25f2 Update the manuals of docker and dockerd
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-26 18:22:31 +08:00
lixiaobing10051267
989e791a42 It is errNoSuchWatch not errNoSuchPoller in filenotify/poller.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-26 16:19:50 +08:00
Akihiro Suda
7d8a9b9234 Merge pull request #29691 from albers/completion-service-create-cleanup
Cleanup bash completion for `service create|update`
2016-12-26 14:56:54 +09:00
allencloud
0b243acbfc split function out of command description scope
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-26 13:50:00 +08:00
Akihiro Suda
fb03b56b9b Merge pull request #29693 from davidxia/fix-typo
Fix typo in docs
2016-12-26 10:45:00 +09:00
David Xia
f394b1d776
Fix typo in docs
s/BlkioDeviceWiiteIOps/BlkioDeviceWriteIOps/g

Signed-off-by: David Xia <dxia@spotify.com>
2016-12-25 11:48:11 -05:00
Harald Albers
d5935f83a7 Cleanup bash completion for service create|update
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-25 06:04:43 -08:00
Harald Albers
83158f8aff Add bash completion for plugin install --alias
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-25 05:32:50 -08:00
Sebastiaan van Stijn
e6366743a1 Merge pull request #29682 from miaoyq/add-volume-prune-to-index
Add 'volume prune' to the volume commands index
2016-12-24 20:21:31 +01:00
Sebastiaan van Stijn
cc439b8844 Merge pull request #29656 from AkihiroSuda/fix-poule
poule: do not recognize "arm" as platform/arm
2016-12-24 19:59:20 +01:00