1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

6464 commits

Author SHA1 Message Date
Anusha Ragunathan
8de2336f07 Merge pull request from vieux/remove_old_media_type_plugin
remove old media type compat for plugins
2016-12-12 12:43:32 -08:00
Qinglan Peng
bac792c163 fix some broken contents links
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>

fix-contents-links

Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>
2016-12-12 21:34:37 +08:00
Vincent Demeester
cc85b14d9c Merge pull request from ohmk/fix-description-of-docker-swarm-command
Fix description of docker swarm command
2016-12-12 10:34:35 +01:00
lixiaobing10051267
abdc031aea replace env description with args in extend config
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-12 17:24:12 +08:00
Kei Ohmura
2f0e00f587 docs: fix description of docker swarm update --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
2016-12-11 21:25:40 +09:00
Kei Ohmura
77dd8474a7 docs: fix description of docker swarm join --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
2016-12-11 21:21:48 +09:00
Anusha Ragunathan
0a072e93df Merge pull request from tiborvass/plugin-fixes
plugins: container-rootfs-relative paths
2016-12-09 12:48:59 -08:00
Tibor Vass
c54b717caf plugins: container-rootfs-relative paths
Legacy plugins expect host-relative paths (such as for Volume.Mount).
However, a containerized plugin cannot respond with a host-relative
path. Therefore, this commit modifies new volume plugins' paths in Mount
and List to prepend the container's rootfs path.

This introduces a new PropagatedMount field in the Plugin Config.
When it is set for volume plugins, RootfsPropagation is set to rshared
and the path specified by PropagatedMount is bind-mounted with rshared
prior to launching the container. This is so that the daemon code can
access the paths returned by the plugin from the host mount namespace.

Signed-off-by: Tibor Vass <tibor@docker.com>
2016-12-09 10:16:24 -08:00
Vincent Demeester
98e4a7edb6 Merge pull request from pengqinglan/doc-deprecated
fix some version information
2016-12-09 10:25:50 +01:00
Sebastiaan van Stijn
4bc3b4d6aa Merge pull request from KingEmet/master
Add credential helper documentation
2016-12-08 15:29:35 +01:00
Qinglan Peng
aa26364ce1 fix some version information
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>
2016-12-08 19:03:46 +08:00
lixiaobing10051267
170fcead7e add SCOPE field content for docker network ls
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-08 17:13:38 +08:00
Victor Vieux
f644e758bd remove old media type compat for plugins
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-12-07 17:35:09 -08:00
Vincent Demeester
9468d687ac Merge pull request from erxian/refine-api-swagger.yaml-towards-image-create-status-code
refine api swagger.yaml towards image create status code
2016-12-07 22:03:54 +01:00
Jake Sanders
68211f4cb4 Add credential helper documentation
Signed-off-by: Jake Sanders <jsand@google.com>
2016-12-07 10:14:28 -08:00
lixiaobing10051267
9c76fb253e modify URLs for bind docker in docs/api
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-07 15:06:16 +08:00
erxian
15be050fb3 refine api swagger.yaml towards image create status code
Signed-off-by: erxian <evelynhsu21@gmail.com>
2016-12-07 10:27:40 +08:00
allencloud
0d21e24b9f add 403 for endpoint network create
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-06 14:36:50 +08:00
Chris Gavin
35c82f422d Fix a spelling mistake in the docs.
Signed-off-by: Chris Gavin <chris@chrisgavin.me>
2016-12-04 12:55:00 +00:00
Sebastiaan van Stijn
51c5718aa3 Merge pull request from yongtang/28708-plugin-list-id
Add `ID` field for `docker plugin ls`
2016-12-03 02:37:09 +01:00
Sebastiaan van Stijn
535db46be5 Merge pull request from allencloud/add-missing-code-in-api-docs
add missing status code of swarm cluster in api 1.24
2016-12-03 02:04:05 +01:00
Yong Tang
8a226ed643 Add ID field for docker plugin ls
This fix tries to address the enhancement proposed in 28708 to display
ID field for the output of `docker plugin ls`.

This fix add `ID` field to the output of `docker plugin ls`

Related docs has been updated.

This fix fixes 28708.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-02 13:42:50 -08:00
allencloud
9a1f7b6b0b add missing status code in api docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-12-02 11:24:45 +08:00
Yong Tang
0ce6e070f7 Allow docker plugin inspect to search based on ID or name
This fix tries to address the issue raised in discussion of
PR 28735 where it was not possible to manage plugin based on
plugin ID. Previously it was not possible to invoke
`docker plugin inspect` with a plugin ID (or ID prefix).

This fix updates the implementation of `docker plugin inspect`
so that it is possbile to search based on a plugin name, or a
plugin ID. A short format of plugin ID (prefix) is also possible,
as long as there is no ambiguity.

Previously the check of `docker plugin inspect` was mostly done
on the client side. This could potentially cause inconsistency
between API and CMD. This fix move all the checks to daemon side
so that API and CMD will be consistent.

An integration test has been added to cover the changes.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-01 10:44:17 -08:00
Sebastiaan van Stijn
a3be176f13 Merge pull request from yuexiao-wang/fix-secret
Fix the inconsistency for secret ls and secrect rm
2016-12-01 11:29:58 +01:00
Sebastiaan van Stijn
457d562af1 Merge pull request from erxian/correct-secret-remove-http-return-code
correct the http return code of secret remove
2016-11-30 22:47:28 +01:00
Alexander Morozov
53d69aeb74 Merge pull request from vdemeester/revert-service-ps-all
Revert "Add -a option to service/node ps"
2016-11-30 12:02:34 -08:00
Alexander Morozov
caaa52c124 Merge pull request from AkihiroSuda/remove-run-mount
[Revert ] cli: remove `--mount` from `docker run`
2016-11-30 11:56:42 -08:00
Sebastiaan van Stijn
643b1c0175 Merge pull request from bfirsh/2016-11-25-api-docs
Updates to swagger.yaml and API documentation
2016-11-30 15:49:25 +01:00
erxian
21768933fb correct the http return code of secret remove
Signed-off-by: erxian <evelynhsu21@gmail.com>
2016-11-30 19:45:45 +08:00
yuexiao-wang
b4306588e9 Fix the inconsistency for docker secret
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-30 17:23:39 +08:00
Sebastiaan van Stijn
7debf456e3 Merge pull request from Microsoft/jjh/volumenote
Windows: Note about volumes in run
2016-11-29 17:40:54 +01:00
Vincent Demeester
9387ccc683 Merge pull request from miaoyq/fix-some-format-err
Fix some format errors
2016-11-29 16:02:35 +01:00
Yanqiang Miao
71f1205269 Fix some format errors
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2016-11-29 21:45:04 +08:00
Sebastiaan van Stijn
f06c2f230a Merge pull request from yuexiao-wang/modify-link
Modify the link about config.json for docker plugin create
2016-11-29 14:28:32 +01:00
Misty Stanley-Jones
2178c840ba Document publishing a UDP port
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 15:41:56 -08:00
Victor Vieux
d73f73b365 update plugin example
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

cleanup whitespace formatting

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-28 23:44:24 +01:00
John Howard
b9e65f40cf Windows: Note about volumes in run
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-11-28 11:06:01 -08:00
Sebastiaan van Stijn
0e0a5e0d39 Merge pull request from mstanleyjones/fix_doubled_words
Fix instances of doubled words
2016-11-28 19:57:17 +01:00
Misty Stanley-Jones
379e9259cf Fix instances of doubled words
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 10:48:45 -08:00
Misty Stanley-Jones
2333657e1b Fix copypaste error 'is-automated'
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 10:31:38 -08:00
Misty Stanley-Jones
a1f55dca21 Fix some redirect loops and problems
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 09:46:38 -08:00
Vincent Demeester
eb55d03f3c
Revert "Add -a option to service/node ps"
This reverts commit 139fff2bf0.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-28 18:08:45 +01:00
Vincent Demeester
b20bf510e5 Merge pull request from yuexiao-wang/modify-plugin
Modify repoName to PLUGIN for docker plugin create
2016-11-28 17:52:04 +01:00
Sebastiaan van Stijn
85a99c8891 Merge pull request from erxian/fix-doc-about-service-create
fix doc about service create in docker_remote_api_v1.24.md
2016-11-28 16:06:50 +01:00
Antonio Murdaca
76459076c2 Merge pull request from vdemeester/remove-stack_config-doc
Remove docker stack config commandline reference doc
2016-11-28 15:34:29 +01:00
Sebastiaan van Stijn
c04cf54d4e Merge pull request from albers/docs-stack-ls-aliases
Add aliases and options to `docker stack ls` docs
2016-11-28 15:27:35 +01:00
Vincent Demeester
3f98871a19
Remove docker stack config commandline reference doc
`docker stack config` command does not exists anymore, removing it
from the command reference documentation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-28 15:25:52 +01:00
Ben Firshman
d9b109b807
Fix headings in old API docs
Jekyll automatically adds titles based on the title of the page,
so this was causing duplicate titles.

Also, made all the headings the correct level.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-28 11:24:22 +00:00
Kei Ohmura
4a3207de5b fix more according to the actual output of 'docker swarm init --help'
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
2016-11-28 18:40:11 +09:00