Commit Graph

2166 Commits

Author SHA1 Message Date
Trapier Marshall 84477efeb4 fix typo in reference for service create
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
Upstream-commit: e1eea7b951
Component: cli
2017-06-02 00:10:44 +00:00
Harald Albers e0a7ab71aa Add docs for docker network create --attachable
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: a325d3ea2a
Component: cli
2017-06-02 00:10:44 +00:00
Harald Albers dfec30521c Make bash completion for docker stack deploy --bundle-file experimental
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ea5be8f75f
Component: cli
2017-06-02 00:10:44 +00:00
Vincent Demeester 77de2eabdc Remove --port and update --publish for services to support syntaxes
Add support for simple and complex syntax to `--publish` through the
use of `PortOpt`.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b837f7456d
Component: cli
2017-06-02 00:10:44 +00:00
yuexiao-wang 1d2468df13 Update the manual for docker wait
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: fe9be95dec
Component: cli
2017-06-02 00:10:44 +00:00
Sebastiaan van Stijn cdc8c82fea Update reference docs for service ps
commit bbd2018ee19eff5594ae3986bf56fbcd0044699d
changed the output format of `docker service ps`.

this patch updates the reference docs
to match the updated output format.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: baea245377
Component: cli
2017-06-02 00:10:44 +00:00
yuexiao-wang 668d35e913 Fix the incorrect option name
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4df2866d4e
Component: cli
2017-06-02 00:10:44 +00:00
lixiaobing10051267 9f81289a72 stack_config.md not exist and delete it
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: d408f74d07
Component: cli
2017-06-02 00:10:44 +00:00
Sebastiaan van Stijn 6c42c738d3 deprecate "top-level" network information in NetworkSettings
When inspecting a container, `NetworkSettings` contains top-level
information about the default ("bridge") network;

`EndpointID`, `Gateway`, `GlobalIPv6Address`, `GlobalIPv6PrefixLen`,
`IPAddress`, `IPPrefixLen`, `IPv6Gateway`, and `MacAddress`.

These properties are deprecated in favor of per-network properties in
`NetworkSettings.Networks`. These properties were already "deprecated" in
docker 1.9, but kept around for backward compatibility.

Refer to [#17538](https://github.com/docker/docker/pull/17538) for further
information.

This officially deprecates these properties, and marks them
for removal in 1.16

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 96d5009f10
Component: cli
2017-06-02 00:10:44 +00:00
yuexiao-wang a8153231ae Update the option 'network' for docker build
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 378a9d816b
Component: cli
2017-06-02 00:10:44 +00:00
Victor Vieux bd7f8f8f9e remove old media type compat for plugins
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 5bfa17e58b
Component: cli
2017-06-02 00:10:44 +00:00
Qinglan Peng 5f243da8df 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>
Upstream-commit: 2d40fc55b8
Component: cli
2017-06-02 00:10:44 +00:00
Kei Ohmura 09cfe3454c docs: fix description of docker swarm update --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: 967a6bf70d
Component: cli
2017-06-02 00:10:44 +00:00
Kei Ohmura 9012475dbc docs: fix description of docker swarm join --help
Signed-off-by: Kei Ohmura <ohmura.kei@gmail.com>
Upstream-commit: b81f7aba37
Component: cli
2017-06-02 00:10:44 +00:00
lixiaobing10051267 f865a2ecbe replace env description with args in extend config
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 2373288938
Component: cli
2017-06-02 00:10:44 +00:00
Harald Albers ecdd598b2a Add bash completion for docker inspect --type plugin
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0c3697d499
Component: cli
2017-06-02 00:10:43 +00:00
Steve Durrheimer 1ac48acf56 Add zsh completion for 'docker inspect --type=plugin' and other missing ones
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: f25ad6e8b7
Component: cli
2017-06-02 00:10:43 +00:00
Tibor Vass 47e77de42d 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>
Upstream-commit: 5a84f77819
Component: cli
2017-06-02 00:10:43 +00:00
Qinglan Peng 6f86448579 fix some version information
Signed-off-by: Qinglan Peng <qinglanpeng@zju.edu.cn>
Upstream-commit: 1ca2bb4e0b
Component: cli
2017-06-02 00:10:43 +00:00
Jake Sanders 857189b456 Add credential helper documentation
Signed-off-by: Jake Sanders <jsand@google.com>
Upstream-commit: 5ee07f7a96
Component: cli
2017-06-02 00:10:43 +00:00
lixiaobing10051267 c7e1b80d2b add SCOPE field content for docker network ls
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 6cc17b6549
Component: cli
2017-06-02 00:10:43 +00:00
Steve Durrheimer 6d94bbc890 Add zsh completion for 'docker network create --attachable'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b94c1ab634
Component: cli
2017-06-02 00:10:43 +00:00
Harald Albers f87af12250 Add bash completion for docker network create --attachable
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d77a7ca0c1
Component: cli
2017-06-02 00:10:43 +00:00
Harald Albers 23d5be4a21 Fix bash completion for `docker service create|update
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: b6365dc413
Component: cli
2017-06-02 00:10:43 +00:00
Harald Albers acf1bf74f9 Add bash completion for secret management
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6afaa9c01f
Component: cli
2017-06-02 00:10:43 +00:00
Harald Albers a857a44bbf Add bash completion for docker version --format
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 45a292bc44
Component: cli
2017-06-02 00:10:43 +00:00
Chris Gavin 3beb7410fd Fix a spelling mistake in the docs.
Signed-off-by: Chris Gavin <chris@chrisgavin.me>
Upstream-commit: 0a75b0264f
Component: cli
2017-06-02 00:10:43 +00:00
Yong Tang 1573881706 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>
Upstream-commit: 21b9ce971e
Component: cli
2017-06-02 00:10:43 +00:00
Yong Tang a5a4a6d8b1 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>
Upstream-commit: 5d6468af96
Component: cli
2017-06-02 00:10:43 +00:00
Harald Albers e316264926 Add bash completion for experimental docker deploy
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 5b7c564969
Component: cli
2017-06-02 00:10:43 +00:00
Harald Albers 0cb48c811d Allow selective activation of experimental features in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e0659770b3
Component: cli
2017-06-02 00:10:43 +00:00
lixiaobing10051267 7cef2520f3 rectify several wrong URLs in branch of man
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: ae2c5f63e5
Component: cli
2017-06-02 00:10:43 +00:00
yuexiao-wang f0cf23a7f8 Fix the inconsistency for docker secret
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 021d177ed1
Component: cli
2017-06-02 00:10:43 +00:00
Harald Albers fd4925ee0d Add more types to bash completion of docker inspect
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c310a10969
Component: cli
2017-06-02 00:10:42 +00:00
lixiaobing10051267 bf80e1d186 modify some urls related to reference path
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: bfa5aeec42
Component: cli
2017-06-02 00:10:42 +00:00
Vincent Demeester a467c69c26 Revert "Add bash completion for docker service ps --all"
This reverts commit 188d2fac57d63888f08531adc46aa3349e3b4f3a.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c7fe3a1685
Component: cli
2017-06-02 00:10:42 +00:00
Vincent Demeester f8a989f686 Revert "Add -a option to service/node ps"
This reverts commit 139fff2bf0ebe12b61871ba8ec8be8d51c2338db.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5ee218987d
Component: cli
2017-06-02 00:10:42 +00:00
Akihiro Suda f60e8dbe1d cli: remove --mount from docker run
This commit reverts 273eeb813c1db0f42c2ad5e053972eeb00907568 (#26825).
For the discussion so far, please refer to #28527.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: a5053dce24
Component: cli
2017-06-02 00:10:42 +00:00
Steve Durrheimer cc1ac47c15 Add zsh completion for 'docker stack' subcommand
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0bdfdf3779
Component: cli
2017-06-02 00:10:42 +00:00
Harald Albers 95d254a316 Add bash completion for docker stack
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: bc1a16b866
Component: cli
2017-06-02 00:10:42 +00:00
lixiaobing10051267 6762d081eb Give the correct location for plugin documentation
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: ca700dfb33
Component: cli
2017-06-02 00:10:42 +00:00
John Howard 58d2d0498d Windows: Note about volumes in run
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 64a17b65c3
Component: cli
2017-06-02 00:10:42 +00:00
Yanqiang Miao 9bc2b4dd44 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>
Upstream-commit: e248501799
Component: cli
2017-06-02 00:10:42 +00:00
yuexiao-wang ecf6047eb5 Modify the link for config.json
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 4abd9ea9a9
Component: cli
2017-06-02 00:10:42 +00:00
Misty Stanley-Jones eb04210a4f Document publishing a UDP port
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 4f414e56d4
Component: cli
2017-06-02 00:10:42 +00:00
Victor Vieux 9d6e16b26b update plugin example
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

cleanup whitespace formatting

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: b82e761088
Component: cli
2017-06-02 00:10:42 +00:00
William Henry 2aa00fd89f Added and example of using --format with docker images
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

Signed-off-by: William Henry <whenry@redhat.com>
Upstream-commit: 9fa1e6637b
Component: cli
2017-06-02 00:10:42 +00:00
Misty Stanley-Jones 94ebef2849 Fix instances of doubled words
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: d2ff281196
Component: cli
2017-06-02 00:10:42 +00:00
Misty Stanley-Jones b3d421b217 Fix copypaste error 'is-automated'
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 4c71c95e34
Component: cli
2017-06-02 00:10:42 +00:00
Misty Stanley-Jones 7b298b591a Fix some redirect loops and problems
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: d5b3df0c2f
Component: cli
2017-06-02 00:10:42 +00:00