toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,953 Commits 3 Branches 295 Tags
7218cd6b9aefced13f489081ff9143f40a8157ae
Commit Graph
6515 Commits
Author SHA1 Message Date
Victoria Bialas 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
Sebastiaan van Stijn 5ef85a095b Merge pull request #29500 from WeiZhang555/add-missing-flag 
Add missing "--default-runtime" flag in manpage
Upstream-commit: a8bcef6fddb21e7edcf1050631dfd8e6491297ae
Component: engine
 2016-12-22 16:22:53 +01:00
Zhang Wei 32a699cc17 Add missing "--default-runtime" flag in manpage 
Add missing flag and more descriptions in manpage.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 977fd439857006ab34deebac384b621bf4dae7da
Component: engine
 2016-12-22 23:00:40 +08:00
Vincent Demeester 1e12b9ad9a Merge pull request #29600 from allencloud/update-docs-about-service-update 
update service update in docs
Upstream-commit: 524704143b1f27650db9debe22adb9cf1e583930
Component: engine
 2016-12-22 15:17:51 +01:00
Vincent Demeester a961c58e58 Merge pull request #29603 from mstanleyjones/docker_diff_improvements 
Clarify what docker diff shows
Upstream-commit: 0ca3e84227a04c0c6256f55b92e9205bd1ca9309
Component: engine
 2016-12-22 15:15:01 +01:00
Vincent Demeester 16e5c73977 Merge pull request #29532 from yuexiao-wang/add-link-swarm 
Add the link for swarm reference document
Upstream-commit: b47cb6095dab3691d8838e46c92cc9ec22a75f05
Component: engine
 2016-12-22 15:13:47 +01:00
Vincent Demeester 194c3ebac2 Merge pull request #29565 from yuexiao-wang/fix-typo-tls 
Change tls to TLS
Upstream-commit: 8f9a48ab5a57b33e99a5231a1ea966cd3910373e
Component: engine
 2016-12-22 12:10:09 +01:00
Vincent Demeester c4e7f016d4 Merge pull request #29468 from hongbin/volume-plugin-fuxi 
Add Fuxi Volume Plugin to the docs
Upstream-commit: 13f45768f037d77da50317c338c32512e137c92c
Component: engine
 2016-12-21 21:49:28 +01:00
Brian Goff 1173e9c692 Merge pull request #29637 from wxb0521/bo-docker-0.5 
some punctuation errors and a verb form error
Upstream-commit: 584485abca124d45e08b618e23b7cbf7b947895f
Component: engine
 2016-12-21 12:18:04 -05:00
allencloud 5f8f7eaafe update service update in docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b44efead25a1d2600f0950e5e2800c17e7489a43
Component: engine
 2016-12-22 00:11:08 +08:00
Xinbo Weng b238e8e00f some punctuation errors and a verb form error 
Signed-off-by: Xinbo Weng <xihuanbo_0521@zju.edu.cn>
Upstream-commit: 32996d6016a9f109a44301279d52d881651790e9
Component: engine
 2016-12-21 20:05:19 +08:00
Anran Qiao c2a452db81 Fix document typos 
Change the `State` field of the `/containers/json` remote API response to lowercase.
This change involves docs/api/v1.23.md and docs/api/v1.24.md

Signed-off-by: Anran Qiao <anran.qiao@daocloud.io>
Upstream-commit: 3dc3921c76a2d21c652ec867e42e9bbe095d91da
Component: engine
 2016-12-21 18:28:52 +08:00
Sebastiaan van Stijn 6aa55086ca Merge pull request #29561 from londoncalling/docs-glossary-d4mac-d4win 
updates to glossary re: d4mac, d4win, toolbox per user request
Upstream-commit: fb41283e493ab5d9c083433cdffdf2fba4019ecb
Component: engine
 2016-12-21 02:16:28 +01:00
Misty Stanley-Jones 4c53abe848 Clarify what docker diff shows 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 4497801c8a35ca2be9467419c5addff5166442d0
Component: engine
 2016-12-20 17:03:11 -08:00
Sebastiaan van Stijn d224f4ec28 Merge pull request #29450 from yongtang/29291-no-default-replicas-output 
Fix misleading defaults for service create/update
Upstream-commit: b1cb8979987c5a7ba4b8a30f0ba5147d76671c01
Component: engine
 2016-12-20 17:11:05 +01:00
Sebastiaan van Stijn 35814260ea Merge pull request #29583 from liliVicky/my-feature2 
correct some words
Upstream-commit: e6d06a5271cd176b38aac02d97163e65ece500a9
Component: engine
 2016-12-20 15:37:59 +01:00
Brian Goff 92139ffe94 Merge pull request #29589 from lixiaobing10051267/masterDockerPs 
field NAMES ommitted after docker ps in commit.md
Upstream-commit: 9eb9abea6d22e795298871500df061ec7e9644f6
Component: engine
 2016-12-20 09:27:13 -05:00
yuexiao-wang b5e0f7eb0f Change tls to TLS 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 113cae5ba2a0edadadbdf8aea06a52ab6b5f0361
Component: engine
 2016-12-20 22:08:07 +08:00
lixiaobing10051267 3f00f70bbf field NAMES ommitted after docker ps in commit.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: f34ccd70c8c55946fe9d3b83b44bdac770858176
Component: engine
 2016-12-20 20:34:09 +08:00
yuexiao-wang ecbc8d61e5 Add the link for swarm reference document 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: ee23a8e124ef4801bcd0d044578da8daf63cba6f
Component: engine
 2016-12-20 18:09:21 +08:00
liwenqi 420207ba8c correct some words 
Signed-off-by: liwenqi <vikilwq@zju.edu.cn>

Update ISSUE-TRIAGE.md

Signed-off-by: vicky <395658237@qq.com>
Upstream-commit: b506f8ecdd5ca8adb5d8ad77f085283ee5f584d6
Component: engine
 2016-12-20 17:43:26 +08:00
Yong Tang 96f73955fb 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>
Upstream-commit: acc93db32bd0d14801db65d6cb0a0e06d7cec2f7
Component: engine
 2016-12-19 19:35:05 -08:00
allencloud e32e0ddf32 update docs about --oom-score-adj 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: bb85d483b7cc53ad36d062f624f36ac58e2c9b40
Component: engine
 2016-12-20 11:14:39 +08:00
Victoria Bialas 2679f51d97 updates to d4win description per review comments 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 56af047ca8e1fbe989072cad7c722446aa2b6177
Component: engine
 2016-12-19 17:41:51 -08:00
Victoria Bialas 106e0d2810 updates to glossary re: d4mac, d4win, toolbox per user request 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: b9e5a6228f7e12eecca430f81adb8660fd89071d
Component: engine
 2016-12-19 17:25:04 -08:00
Vincent Demeester ad939616ff Merge pull request #29541 from tim-zju/spellError 
spell error: in other parts, they are lower-case
Upstream-commit: 8a41c1d548835afcc5f6021f15e0c885ed99ef7c
Component: engine
 2016-12-19 14:48:31 +01:00
Vincent Demeester 55338a0e87 Merge pull request #29510 from albers/docs-remove-node-ps--all 
Remove `--all|-a` from `docker node ps` reference
Upstream-commit: 309df6a59217852a8f1b14504ba064bbefb4727d
Component: engine
 2016-12-19 09:31:43 +01:00
tim-zju 490fa1ab01 spell error: in other parts, they are lower-case 
Signed-off-by: tim-zju <21651152@zju.edu.cn>
Upstream-commit: 4bf9e7caaa31035904529ee6305921821b5aa207
Component: engine
 2016-12-19 13:05:11 +08:00
Michael 0fa3af8470 [docs,man] Fixed typo (#29516) 
Signed-off-by: Michael Käufl <docker@c.michael-kaeufl.de>
Upstream-commit: e85bb788de950090c66e8501d294bd8b5e4e4723
Component: engine
 2016-12-18 19:55:09 -05:00
Harald Albers 46f764687c Remove --all|-a from docker node ps reference 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 364e9002375fca1799180dd76e8074d922dd4044
Component: engine
 2016-12-18 06:47:54 -08:00
Sebastiaan van Stijn 2b846c8a06 Merge pull request #28629 from yongtang/28581-secret-create-input 
Add `--file` flag for `docker secret create` command
Upstream-commit: 4436a5946d1cc20efb3af5a3d0c56894c02f1a29
Component: engine
 2016-12-18 03:04:10 +01:00
Hongbin Lu 0125cfbb9f Add Fuxi Volume Plugin to the docs 
Signed-off-by: Hongbin Lu <hongbin034@gmail.com>
Upstream-commit: ce25f1d5db84c03d1035b2c0ff1891bdc1a588c0
Component: engine
 2016-12-16 13:04:40 -06:00
Aaron Lehmann 9691034423 Merge pull request #29482 from thaJeztah/not-for-workers-only 
swarm leave is not only for workers
Upstream-commit: 87e8828dffb29c351486e1e286c597cef238c5d1
Component: engine
 2016-12-16 09:48:35 -08:00
Sebastiaan van Stijn 588ffd020c Merge pull request #29434 from yuexiao-wang/pause-and-unpause 
Fix inconsistency for pause and unpause
Upstream-commit: ba76c9214dbbc5d6276a20136eb3c454a1aa0969
Component: engine
 2016-12-16 16:42:04 +01:00
Sebastiaan van Stijn 148f65373a 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>
Upstream-commit: f89eee5d9d3c01bc6d498fcb1163ec199e6c3078
Component: engine
 2016-12-16 15:10:20 +01:00
yuexiao-wang 668e4bdf14 Add the whole related information for node 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b67b0949ed4b528fef6c3dc059a4bd16d5f2a929
Component: engine
 2016-12-16 22:21:52 +08:00
yuexiao-wang b689c13fe1 Fix inconsistency for pause and unpause 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 082f4919cac55f32674874d96d82a310f6b1522d
Component: engine
 2016-12-16 17:27:28 +08:00
Sebastiaan van Stijn fd62091f94 Merge pull request #29383 from yuexiao-wang/add-logs-link 
Add the link for service logs
Upstream-commit: e9a69316b8245413eec9ac4fb8b2267883855b74
Component: engine
 2016-12-15 13:23:18 +01:00
yuexiao-wang 3baf7d2e75 Add the link for service logs 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 54d38fe115e0183af7d862e54ba6e58c347e2a8d
Component: engine
 2016-12-15 17:43:51 +08:00
Vincent Demeester 15f4ce0b26 Merge pull request #29419 from trapier/reference_service_create_typo 
fix typo in reference for service create
Upstream-commit: 31eea90f523e6033951176719594b7a477a17e74
Component: engine
 2016-12-15 09:45:17 +01:00
Trapier Marshall 91cbeaba53 fix typo in reference for service create 
Signed-off-by: Trapier Marshall <trapier.marshall@docker.com>
Upstream-commit: 90c680ad259057d0065662a1a6fdad779bde6082
Component: engine
 2016-12-14 14:56:55 -05:00
Harald Albers e1cfecec53 Add docs for docker network create --attachable 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7433d3acf61142bb1abbf7928ff0e20acf3eda56
Component: engine
 2016-12-14 08:39:10 -08:00
Yong Tang c3c5d1b1fc 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>
Upstream-commit: c6f0b7f448fac4d037d00f944a7908c60c04dff2
Component: engine
 2016-12-13 07:35:45 -08:00
Sebastiaan van Stijn 30be95cf13 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: 5902fa33840507706e6e9b189fec0adeb20affa5
Component: engine
 2016-12-13 13:30:58 +01:00
Vincent Demeester 252ac47c97 Merge pull request #29216 from allencloud/add-status-code-403-for-services-create 
add missing status code 403 for services/create in docs
Upstream-commit: 1bc942597d4a4cfb16493f416eb1c4c36029819b
Component: engine
 2016-12-13 12:27:56 +01:00
lixiaobing10051267 1bef3cf8f2 stack_config.md not exist and delete it 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: afaff51a8b59630f880493679906acc3acc3005a
Component: engine
 2016-12-13 18:06:18 +08:00
Vincent Demeester d26a2271f7 Merge pull request #28437 from thaJeztah/deprecate-default-network-inspect 
deprecate "top-level" network information in NetworkSettings
Upstream-commit: 7f44e09797351d5a62eb044d1832bab9a40c1b98
Component: engine
 2016-12-13 08:58:57 +01:00
Vincent Demeester 90bc3ba4b5 Merge pull request #29267 from yuexiao-wang/fix-bulid-para 
Update the option for docker build
Upstream-commit: 3d52c86d4c8405372445502b2592e8f63132ce99
Component: engine
 2016-12-13 08:55:20 +01:00
yuexiao-wang d619a55e45 Update the option 'network' for docker build 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: cd317282c9b7d4dc68dce8df1d2f84e7a5654e72
Component: engine
 2016-12-13 18:18:53 +08:00
Anusha Ragunathan e31c4556e5 Merge pull request #29230 from vieux/remove_old_media_type_plugin 
remove old media type compat for plugins
Upstream-commit: 8de2336f078af8467900e0c6591e5732755733bc
Component: engine
 2016-12-12 12:43:32 -08:00