1092bf17b8
Merge pull request #26313 from yongtang/26312-network-ls-help-output-volume
...
Fix incorrect help output in `docker network ls`
Upstream-commit: 1325cde252cd3f117c56a51fd2292194e9f68631
Component: engine
2016-09-05 19:13:09 +02: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
a5e3c6ff62
Merge pull request #26292 from lixiaobing10051267/masterDockerPull
...
modify output info for docker pull centos
Upstream-commit: 175188d8b0eb976cceb6c46de439186eec98e40e
Component: engine
2016-09-05 15:44:01 +02:00
f4b10db50e
docs: mention NFS support for contiv volume plugin
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: faaccf26e3936fd34c049267a17b6a34e06a2b4d
Component: engine
2016-09-05 12:38:50 +03: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
509edc829c
Merge pull request #26302 from vdemeester/health_status-in-event-docs
...
Add health status as action on events documentations
Upstream-commit: b468df9eac16d73c9b8e4853411df1fafea37d1f
Component: engine
2016-09-05 10:03:14 +10:00
f1e49b9e9a
Merge pull request #26245 from dbdd4us/master
...
add volumes, networks, nodes and services into label doc
Upstream-commit: 384de833c0f7e20d6a36b6786d1f2e2e67b90d2f
Component: engine
2016-09-05 10:02:35 +10: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
4e526a616e
modify output info for docker pull centos
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 6becc1a5774e391a3dcade645cdeff46577bf6fa
Component: engine
2016-09-03 22:27:18 +08:00
7f24fbc8dc
Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
...
update docs/reference/commandline/service_create.md
Upstream-commit: 1a04d7b1e13ffe725a5310b55e83ae60b1ab7e55
Component: engine
2016-09-02 12:39:31 +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
e92f9d7cac
Merge pull request #24510 from runcom/new-seccomp-format
...
New seccomp json format
Upstream-commit: 9d71cba5f09825cdafe04fdb0243cc30bf887b68
Component: engine
2016-09-02 09:14:01 +01: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
7a15c4b5ad
add volumes, networks, nodes and services into label doc
...
Signed-off-by: dbdd <wangtong2712@gmail.com >
Upstream-commit: 30404950c49986291c02e1f9e6f0fce3cb54e09b
Component: engine
2016-09-01 20:25:19 +08:00
009555a4b2
New seccomp format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 5ff21add06ce0e502b41a194077daad311901996
Component: engine
2016-09-01 11:53:07 +02:00
4fbbab7cfa
The first letter docker is small
...
Upstream-commit: e0e62874bb9bcdaf6418e0d1728c9170527b3c3a
Component: engine
2016-09-01 17:03:01 +08: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
33fbdef4b0
Merge pull request #26187 from albers/docs-volume-create-fix
...
Fix argument order for docker create in tutorial
Upstream-commit: 670eaa71a0629323327cb5604c44abf14890d4b4
Component: engine
2016-08-31 14:41:22 +02:00
4b86079014
Merge pull request #26185 from yuexiao-wang/update-docs
...
Update description for docker plugin inspect
Upstream-commit: 0414a2c1a960832cc6d3df8641f23952c3700084
Component: engine
2016-08-31 14:41:03 +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
589e937fbd
Merge pull request #26122 from sfsmithcha/updates_for_new_plugin_docs
...
some fixes to clean up new plugin system docs
Upstream-commit: c1b82df74042a0290b995283c504b60ac6b4bc95
Component: engine
2016-08-31 10:43:02 +02:00
a779e2caf3
Fix argument order for docker create in tutorial
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 109334030cd970475b0ec313b0f8709a5cad1c42
Component: engine
2016-08-31 09:41:04 +02: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
af4e81149a
typo
...
Signed-off-by: Javier Bassi <javierbassi@gmail.com >
Upstream-commit: 682a8ecb8b77e35745c1720b9c9ee9a5fe885fa4
Component: engine
2016-08-30 19:46:07 -03:00
458bf87add
some fixes to clean up new plugin system docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 1dee308281c48a1363fff2433d842fcaa971dce4
Component: engine
2016-08-30 13:52:13 -07: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
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
ab43397cd4
fixed line spacing in Swarm tutorial bullets
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: dcf00020e14f3f10b32e3d72196d390f3083d2ee
Component: engine
2016-08-29 11:53:03 -07: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
d155bb2709
Merge pull request #26080 from sw-double/patch-1
...
[docs] Fix volume binding in fluentd container example
Upstream-commit: ad73e8f169ee39ed830bfa385583bddd5741012d
Component: engine
2016-08-29 14:36:49 +02: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
d2efc6a5c4
Fix volume binding in fluentd container example
...
Signed-off-by: Konstantin L <sw.double@gmail.com >
Upstream-commit: c450e608b9b1f79f474dbfb468ab26ae0f741868
Component: engine
2016-08-28 11:45:28 +08: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
38d8783059
Merge pull request #26036 from yuexiao-wang/add-gcplog
...
Add the content for Google Cloud Loging driver in index
Upstream-commit: 48659599cbb4c896e9597e50ae16c087d9dd5ac9
Component: engine
2016-08-27 14:51:16 +02: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
0d384275a3
Merge pull request #26028 from londoncalling/docs-pinata-for-swarm
...
Clarify how to use d4mac, d4win with swarm mode
Upstream-commit: 6072e6bfd20598f4e9cb28d32c09bfddec6df76c
Component: engine
2016-08-26 15:55:26 -07:00
