69668dcc9a
support docker node ps multiNodes
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: af4461ad290d660acab5ef87b96e392263cc7cb9
Component: engine
2016-09-10 02:52:48 +08:00
574f281ca0
Merge pull request #26224 from q384566678/test-zhou
...
Modify rename function use tips
Upstream-commit: 061cc417591217c4bcf735267c2de18f2a8189c0
Component: engine
2016-09-08 11:22:21 -07:00
774225b30e
Merge pull request #26228 from lixiaobing10051267/masterPluginRm
...
check inconsistant command in docs/reference/commandline
Upstream-commit: e96c0fafa0465e7d1a3a12fda820c16d0449f814
Component: engine
2016-09-08 11:09:18 -04:00
e42ce8aa21
Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage
...
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905 )
Upstream-commit: 6f0502b89b29a7d23b02363d02104ec531a36e4a
Component: engine
2016-09-07 10:38:59 -07:00
a8af3835c4
Merge pull request #26269 from yuexiao-wang/remove-option
...
Remove the option for the command service rm
Upstream-commit: 20607e2cc20662453226938e4fe0d7ca40fc6ae7
Component: engine
2016-09-07 11:31:11 -04:00
64292ad8e2
Merge pull request #26218 from frosforever/fix_run_reference_typo
...
Correct typo in run reference docs that use the create command
Upstream-commit: e73e37f11206a346d2a552c5d133112cd103d562
Component: engine
2016-09-07 22:18:26 +10:00
773fd0e328
Merge pull request #26212 from rhvgoyal/xfs-enospc
...
devmapper: Set xfs max_retries to 0 upon ENOSPC
Upstream-commit: 0d03c060c7e6800e60833c4462b917ee9b081440
Component: engine
2016-09-06 09:03:09 -07:00
8226c5b8ed
Merge pull request #26307 from AkihiroSuda/fix-doc-26291
...
fix docs about `sudo docker login`
Upstream-commit: da763602afbb25ea4428e1d608af5ee017a0b94e
Component: engine
2016-09-06 17:47:46 +02:00
56f38b6496
Add response to swarm/init example ( fixes #25625
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: a2a0a03e2b801545b2e3fb9e8476c76370da9175
Component: engine
2016-09-06 08:39:53 -07:00
c53f181a9b
Fix incorrect help output in docker network ls
...
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```
This fix changes the help output to:
```
-q, --quiet Only display network IDs
```
This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`
This fix fixes 26312.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b9e46235fadc6b390e2c04c44b6a865e4ea97cb8
Component: engine
2016-09-05 08:24:22 -07:00
aabe996fb1
Merge pull request #26236 from yuexiao-wang/remove-h-option
...
Remove -h option for docker cli
Upstream-commit: 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b
Component: engine
2016-09-05 09:52:18 +02:00
c84cf3cf3a
fix docs about sudo docker login
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: d6007b4db0c2dc788fc0b1d2e2c5e95a5fa0701f
Component: engine
2016-09-05 04:44:18 +00:00
5599c8776d
Add health status as action on events documentations
...
This was missing from the docs for 1.12.0.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: fb8b6438f265532ec47e001b2739ed614b47f3a0
Component: engine
2016-09-04 18:01:57 +02:00
c789417f1c
update docs/reference/commandline/service_create.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: aa479616822e4e6ecd9d90425f11f76cd26ce70d
Component: engine
2016-09-02 09:59:20 +00:00
64ea42838d
Remove the option for the command service rm
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 1016cbb64243ca8adc9444779e6e4717a4541ef7
Component: engine
2016-09-02 17:23:59 +08:00
96ee703a5f
Remove -h option for docker cli
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 8ad8245ee39d731af7c79e722435c32f051387f7
Component: engine
2016-09-02 11:46:49 +08:00
9d092e464e
Merge pull request #26241 from YuPengZTE/devNote
...
The first letter of “docker“ is small
Upstream-commit: b14f29dfbd527fd2dbd05e024f760939aba6642c
Component: engine
2016-09-01 20:53:07 +02:00
f9ef0edaad
devmapper: Provide a knob dm.xfs_nospace_max_retries
...
When xfs filesystem is being used on top of thin pool, xfs can get ENOSPC
errors from thin pool when thin pool is full. As of now xfs retries the
IO and keeps on retrying and does not give up. This can result in container
application being stuck for a very long time. In fact I have seen instances
of unkillable processes. So that means once thin pool is full and process
gets stuck, container can't be stopped/killed either and only option left
seems to be power recycle of the box.
In another instance, writer did not block but failed after a while. But
when I tried to exit/stop the container, unmounting xfs hanged and only
thing I could do was power cycle the machine.
Now upstream kernel has committed patches where it allows user space to
customize user space behavior in case of errors. One of the knobs is
max_retries, which specifies how many times an IO should be retried
when ENOSPC is encountered.
This patch sets provides a tunable knob (dm.xfs_nospace_max_retries) so
that user can specify value for max_retries and tune xfs behavior. If
one sets this value to 0, xfs will not retry IO when ENOSPC error is
encountered. It will instead give up and shutdown filesystem.
This knob can be useful if one is running into unkillable
processes/containers issue on top of xfs.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: 4f0017b9ad7dfa2e9dcdee69d000b98595893e60
Component: engine
2016-09-01 11:38:09 -04:00
4fbbab7cfa
The first letter docker is small
...
Upstream-commit: e0e62874bb9bcdaf6418e0d1728c9170527b3c3a
Component: engine
2016-09-01 17:03:01 +08:00
c222d18573
Modify rename function usage
...
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com >
Upstream-commit: 61c8b3380fe35fbd021a3efc1f180c1636d08a27
Component: engine
2016-09-01 14:48:02 +08:00
6be9adf324
check inconsistant command in docs/reference/commandline
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: efe39448f76de4b3eab4feb7235f4f135b987dae
Component: engine
2016-09-01 12:21:52 +08:00
2d42e16cb9
Correct typo in run reference docs that use the create command
...
Signed-off-by: Yosef Fertel <yfertel@gmail.com >
Upstream-commit: 84196adf3d8bf174e269018a3a0b87b5a4afd1ab
Component: engine
2016-08-31 18:09:43 -04:00
c03a13f697
Merge pull request #26139 from yuexiao-wang/fix-link
...
Modify link for hub and registry
Upstream-commit: ad6f5a49d5f24f8b64def11176b6c8df162d839f
Component: engine
2016-08-31 16:37:50 +01:00
5645fa8e4e
Merge pull request #26182 from yuexiao-wang/add-options
...
Miss the options in some commands
Upstream-commit: ba23bf202adab9f4b8c9dcaffeddfd130674fb15
Component: engine
2016-08-31 14:45:42 +02:00
f9a92ea425
Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
...
make command "docker plugin inspect" complete
Upstream-commit: cf699ad427084076c7ca1ea5fbab78cd77597f2a
Component: engine
2016-08-31 14:42:03 +02:00
a2a77498bf
Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
...
provide actual command format for docker network create
Upstream-commit: 37fd1416daac0b3963dc812a820b844e9e854e59
Component: engine
2016-08-31 14:41:49 +02:00
d8db57f8be
make command "docker plugin inspect" complete
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: d022bb208461dd1ed9702d8528eed627bc364258
Component: engine
2016-08-31 19:59:23 +08:00
3dedb3cd52
provide actual command format for docker network create
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 18a9600fb15b057af9d3574210b92cb107eefb24
Component: engine
2016-08-31 17:40:13 +08:00
8de2c11691
Update description for docker plugin inspect
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: fdedc38f0c398a81360a90b627493872ef3c8a56
Component: engine
2016-08-31 16:57:44 +08:00
8af8bf399a
Miss the options in some commands
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: b8af6b579b4f5f3799957165f0a1631b4b68faa4
Component: engine
2016-08-31 14:18:41 +08:00
23c1ddf73c
Merge pull request #26140 from yuexiao-wang/modify-usage
...
Modify options for the command plugin install
Upstream-commit: ec82819cc9c652908fd74fb2082900dfa0468bcc
Component: engine
2016-08-31 00:04:45 +00:00
58d79a8716
Merge pull request #26145 from allencloud/update-command-description
...
update command description
Upstream-commit: 19aee549269ab7e7a025aaf7b820577f52dc4443
Component: engine
2016-08-30 22:16:57 +02:00
cfe42ec17e
Sanitize uses of Swarm as a proper and improper noun
...
Fixes #24905
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 82304abd800701e7e211965f5e433804881240e7
Component: engine
2016-08-30 11:04:41 -07:00
feabcf715e
update command description
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 123ce0e4be7c2743c5dee0a9aff84cd2c23758e0
Component: engine
2016-08-30 23:07:42 +08:00
1f1420a059
Merge pull request #25214 from allencloud/make-node-ps-default-to-self
...
make node ps default to self in swarm node
Upstream-commit: bb1d70da9ad5804794b7aea77abe59fb9e3ac196
Component: engine
2016-08-30 10:37:20 -04:00
1b0ecb4bfa
Merge pull request #26096 from ohmystack/fix/docs-dockerd
...
Add docs for "--containerd" in dockerd
Upstream-commit: 644cb53b41b49fd750fe9c86e922125ef8156259
Component: engine
2016-08-30 13:36:50 +01:00
558afd07bb
Modify options for the command plugin install
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: d08886618eac804e879cc2953a3a07863e90e5e6
Component: engine
2016-08-30 18:45:06 +08:00
37e3bbaff0
make node ps default to self in swarm node
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: b13f5dfd130a69b0eb655d349b7839f12a9384ed
Component: engine
2016-08-30 17:34:16 +08:00
91b527444a
Modify link for hub and registry
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: aedf95e640fe362bbf59516ffa77d8bc1629d507
Component: engine
2016-08-30 16:37:03 +08:00
2aa55a3d95
Fix typo in builder.md
...
Signed-off-by: Kris-Mikael Krister <krismikael@protonmail.com >
Upstream-commit: afcfa77dd80defa996d7d0e073d809ac03493f05
Component: engine
2016-08-30 09:34:10 +02:00
73a8f8cdeb
Add docs for "--containerd" in dockerd
...
Signed-off-by: ohmystack <jiangjun1990@gmail.com >
Upstream-commit: cebb9543e1ae2263905562d1c54e380005d5fe4f
Component: engine
2016-08-30 10:49:39 +08:00
edf9053174
Merge pull request #25317 from yongtang/25304-docker-service-create-group
...
Support `--group` in `docker service create`
Upstream-commit: d09c04a667fc2895650b0c2bb25e28fb226e3f31
Component: engine
2016-08-29 10:27:31 -04:00
97464f18e4
Merge pull request #25990 from vieux/plugin_inspect
...
add -f to plugin inspect
Upstream-commit: bf0077c138a1cf64a42828014c44f8e2b2001703
Component: engine
2016-08-28 17:03:40 +02:00
bdcdcdfff5
Support --group-add and --group-rm in docker service create/update
...
This fix tries to address the issue raised in 25304 to support
`--group-add` and `--group-rm` in `docker service create`.
This fix adds `--group-add` to `docker service create` and `docker service update`,
adds `--group-rm` to `docker service update`.
This fix updates docs for `docker service create` and `docker service update`:
1. Add `--group-add` to `docker service create` and `docker service update`
2. Add `--group-rm` to `docker service update`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b31969ee365f582eb71a7962af9638d79380cd54
Component: engine
2016-08-27 11:54:05 -07:00
1647b02210
Merge pull request #25828 from yuexiao-wang/clean-docs
...
clean up the run.md in reference
Upstream-commit: 2cec66d0f548a274d723dbdfb27d3fafb6df7ec2
Component: engine
2016-08-27 14:50:47 +02:00
67ccfbdecc
Merge pull request #25424 from vieux/enabled
...
replace active by enabled for consistency in plugins
Upstream-commit: ed0dff8f16716b4f6debfc191124e98750dd05bb
Component: engine
2016-08-26 15:22:41 -07:00
d5c2d4c2f5
Merge pull request #23830 from ardnaxelarak/23345_remove_name_from_volume_create
...
remove --name flag from volume create
Upstream-commit: 5168c93419547338b11f5d24d24a2a025ea64524
Component: engine
2016-08-26 21:52:07 +02:00
71cbf188b7
Merge pull request #23614 from icecrime/inspect_services
...
Allow `docker inspect` on all types
Upstream-commit: 6e85b81df2f0a2485b74409813eaa77a2b366685
Component: engine
2016-08-26 18:45:23 +00:00
e357d485dd
add -f to plugin inspect
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 63a19edcb18b1bc650cc1d6eed78c2c3b376be62
Component: engine
2016-08-25 22:40:05 -07:00
7045275ed8
Update documentation for validation of --ip and ip6.
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 5118dd2992aef27890203b7e8eb62fc5f507d931
Component: engine
2016-08-25 22:11:56 -07:00
