Commit graph

1129 commits

Author SHA1 Message Date
Sebastiaan van Stijn
b1cb897998 Merge pull request #29450 from yongtang/29291-no-default-replicas-output
Fix misleading defaults for service create/update
2016-12-20 17:11:05 +01:00
Sebastiaan van Stijn
e6d06a5271 Merge pull request #29583 from liliVicky/my-feature2
correct some words
2016-12-20 15:37:59 +01:00
yuexiao-wang
113cae5ba2 Change tls to TLS
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-20 22:08:07 +08:00
lixiaobing10051267
f34ccd70c8 field NAMES ommitted after docker ps in commit.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-20 20:34:09 +08:00
yuexiao-wang
ee23a8e124 Add the link for swarm reference document
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-20 18:09:21 +08:00
liwenqi
b506f8ecdd correct some words
Signed-off-by: liwenqi <vikilwq@zju.edu.cn>

Update ISSUE-TRIAGE.md

Signed-off-by: vicky <395658237@qq.com>
2016-12-20 17:43:26 +08:00
Yong Tang
acc93db32b Fix misleading default for --replicas
This fix tries to address the issue raised in 29291 where
the output of `--replicas` in `service create/update`:
```
      --replicas uint                    Number of tasks (default none)
```
is misleading. User might incorrectly assume the number of replicas
would be `0` (`none`) by default, while the actual default is `1`.

The issue comes from the fact that some of the default values are
from daemon and it is not possible for client to find out the default
value.

In this case, it might be better to just simply not displaying `(default none)`.

This fix returns "" for `Uint64Opt` so that `(default none)` is hidden.

In addition to `--replicas`, this fix also changes
`--restart-delay`, `--restart-max-attempts`, `--stop-grace-period`,
`--health-interval`, `--health-timeout`, and `--restart-window`
in a similiar fashion.

New Output:
```
      --health-interval duration         Time between running the check (ns|us|ms|s|m|h)
      --health-timeout duration          Maximum time to allow one check to run (ns|us|ms|s|m|h)
...
      --replicas uint                    Number of tasks
...
      --restart-delay duration           Delay between restart attempts (ns|us|ms|s|m|h)
      --restart-max-attempts uint        Maximum number of restarts before giving up
      --restart-window duration          Window used to evaluate the restart policy (ns|us|ms|s|m|h)
...
      --stop-grace-period duration       Time to wait before force killing a container (ns|us|ms|s|m|h)
```

The docs has been updated. Note the docs for help output of `service create/update`
is out of sync with the current master. This fix replace with the update-to-date
help output.

This fix fixes 29291.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-19 19:35:05 -08:00
Vincent Demeester
309df6a592 Merge pull request #29510 from albers/docs-remove-node-ps--all
Remove `--all|-a` from `docker node ps` reference
2016-12-19 09:31:43 +01:00
Michael
e85bb788de [docs,man] Fixed typo (#29516)
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>
2016-12-18 19:55:09 -05:00
Harald Albers
364e900237 Remove --all|-a from docker node ps reference
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-18 06:47:54 -08:00
Sebastiaan van Stijn
4436a5946d Merge pull request #28629 from yongtang/28581-secret-create-input
Add `--file` flag for `docker secret create` command
2016-12-18 03:04:10 +01:00
Aaron Lehmann
87e8828dff Merge pull request #29482 from thaJeztah/not-for-workers-only
swarm leave is not only for workers
2016-12-16 09:48:35 -08:00
Sebastiaan van Stijn
ba76c9214d Merge pull request #29434 from yuexiao-wang/pause-and-unpause
Fix inconsistency for pause and unpause
2016-12-16 16:42:04 +01:00
Sebastiaan van Stijn
f89eee5d9d
swarm leave is not only for workers
the "docker swarm leave" command description
mentioned that the command can only be used
for workers, however, the command can also
be used for managers (using the `-f` / `--force`
option).

this patch removes the "(workers only)" part
of the command description.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-12-16 15:10:20 +01:00
yuexiao-wang
b67b0949ed Add the whole related information for node
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-16 22:21:52 +08:00
yuexiao-wang
082f4919ca Fix inconsistency for pause and unpause
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-16 17:27:28 +08:00
Sebastiaan van Stijn
e9a69316b8 Merge pull request #29383 from yuexiao-wang/add-logs-link
Add the link for service logs
2016-12-15 13:23:18 +01:00
yuexiao-wang
54d38fe115 Add the link for service logs
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-15 17:43:51 +08:00
Vincent Demeester
31eea90f52 Merge pull request #29419 from trapier/reference_service_create_typo
fix typo in reference for service create
2016-12-15 09:45:17 +01:00
Trapier Marshall
90c680ad25 fix typo in reference for service create
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
2016-12-14 14:56:55 -05:00
Harald Albers
7433d3acf6 Add docs for docker network create --attachable
Signed-off-by: Harald Albers <github@albersweb.de>
2016-12-14 08:39:10 -08:00
Yong Tang
c6f0b7f448 Add --file flag for docker secret create command
This fix tries to address the issue raised in 28581 and 28927
where it is not possible to create a secret from a file (only
through STDIN).

This fix add a flag `--file` to `docker secret create` so that
it is possible to create a secret from a file with:
```
docker secret create --file secret.in secret.name
```

or
```
echo TEST | docker secret create --file - secret.name
```

Related docs has been updated.

An integration test has been added to cover the changes.

This fix fixes 28581.
This fix is related to 28927.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-12-13 07:35:45 -08:00
Sebastiaan van Stijn
5902fa3384
Update reference docs for service ps
commit bbd2018ee1
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>
2016-12-13 13:30:58 +01:00
lixiaobing10051267
afaff51a8b stack_config.md not exist and delete it
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-12-13 18:06:18 +08:00
Vincent Demeester
3d52c86d4c Merge pull request #29267 from yuexiao-wang/fix-bulid-para
Update the option for docker build
2016-12-13 08:55:20 +01:00
yuexiao-wang
cd317282c9 Update the option 'network' for docker build
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-12-13 18:18:53 +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
Sebastiaan van Stijn
4bc3b4d6aa Merge pull request #29092 from KingEmet/master
Add credential helper documentation
2016-12-08 15:29:35 +01: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
Jake Sanders
68211f4cb4 Add credential helper documentation
Signed-off-by: Jake Sanders <jsand@google.com>
2016-12-07 10:14:28 -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
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
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 #28922 from yuexiao-wang/fix-secret
Fix the inconsistency for secret ls and secrect rm
2016-12-01 11:29:58 +01:00
Alexander Morozov
53d69aeb74 Merge pull request #28885 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 #28838 from AkihiroSuda/remove-run-mount
[Revert #26825] cli: remove `--mount` from `docker run`
2016-11-30 11:56:42 -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 #28778 from Microsoft/jjh/volumenote
Windows: Note about volumes in run
2016-11-29 17:40:54 +01:00
Sebastiaan van Stijn
f06c2f230a Merge pull request #28819 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
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 #28891 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
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 #28822 from yuexiao-wang/modify-plugin
Modify repoName to PLUGIN for docker plugin create
2016-11-28 17:52:04 +01:00
Antonio Murdaca
76459076c2 Merge pull request #28882 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 #28865 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