YuPengZTE
bd914ff5a3
The etc and dot is seprated
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
2016-09-07 09:02:16 +08:00
Arnaud Porterie
ec82819cc9
Merge pull request #26140 from yuexiao-wang/modify-usage
...
Modify options for the command plugin install
2016-08-31 00:04:45 +00:00
CrimsonGlory
682a8ecb8b
typo
...
Signed-off-by: Javier Bassi <javierbassi@gmail.com>
2016-08-30 19:46:07 -03:00
Vincent Demeester
19aee54926
Merge pull request #26145 from allencloud/update-command-description
...
update command description
2016-08-30 22:16:57 +02:00
allencloud
123ce0e4be
update command description
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-30 23:07:42 +08:00
Daniel Nephin
bb1d70da9a
Merge pull request #25214 from allencloud/make-node-ps-default-to-self
...
make node ps default to self in swarm node
2016-08-30 10:37:20 -04:00
Justin Cormack
644cb53b41
Merge pull request #26096 from ohmystack/fix/docs-dockerd
...
Add docs for "--containerd" in dockerd
2016-08-30 13:36:50 +01:00
yuexiao-wang
d08886618e
Modify options for the command plugin install
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-30 18:45:06 +08:00
allencloud
b13f5dfd13
make node ps default to self in swarm node
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-30 17:34:16 +08:00
Kris-Mikael Krister
afcfa77dd8
Fix typo in builder.md
...
Signed-off-by: Kris-Mikael Krister <krismikael@protonmail.com>
2016-08-30 09:34:10 +02:00
ohmystack
cebb9543e1
Add docs for "--containerd" in dockerd
...
Signed-off-by: ohmystack <jiangjun1990@gmail.com>
2016-08-30 10:49:39 +08:00
Victoria Bialas
dcf00020e1
fixed line spacing in Swarm tutorial bullets
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-08-29 11:53:03 -07:00
Brian Goff
d09c04a667
Merge pull request #25317 from yongtang/25304-docker-service-create-group
...
Support `--group` in `docker service create`
2016-08-29 10:27:31 -04:00
Vincent Demeester
ad73e8f169
Merge pull request #26080 from sw-double/patch-1
...
[docs] Fix volume binding in fluentd container example
2016-08-29 14:36:49 +02:00
Vincent Demeester
bf0077c138
Merge pull request #25990 from vieux/plugin_inspect
...
add -f to plugin inspect
2016-08-28 17:03:40 +02:00
Konstantin L
c450e608b9
Fix volume binding in fluentd container example
...
Signed-off-by: Konstantin L <sw.double@gmail.com>
2016-08-28 11:45:28 +08:00
Yong Tang
b31969ee36
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>
2016-08-27 11:54:05 -07:00
Vincent Demeester
48659599cb
Merge pull request #26036 from yuexiao-wang/add-gcplog
...
Add the content for Google Cloud Loging driver in index
2016-08-27 14:51:16 +02:00
Vincent Demeester
2cec66d0f5
Merge pull request #25828 from yuexiao-wang/clean-docs
...
clean up the run.md in reference
2016-08-27 14:50:47 +02:00
Charles Smith
6072e6bfd2
Merge pull request #26028 from londoncalling/docs-pinata-for-swarm
...
Clarify how to use d4mac, d4win with swarm mode
2016-08-26 15:55:26 -07:00
Victoria Bialas
566c2c9d32
WIP:Clarify how to use d4mac, d4win with Swarm mode
...
updated d4mac, d4win clarification per Charles's comments
copyedits and streamline wording
fixed links
streamlined, fixed line wraps
incorporated more review comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
incorporated more review comments
incorporated more edit comments and fixed line wraps
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-08-26 15:42:45 -07:00
Tibor Vass
ed0dff8f16
Merge pull request #25424 from vieux/enabled
...
replace active by enabled for consistency in plugins
2016-08-26 15:22:41 -07:00
Vincent Demeester
5168c93419
Merge pull request #23830 from ardnaxelarak/23345_remove_name_from_volume_create
...
remove --name flag from volume create
2016-08-26 21:52:07 +02:00
Arnaud Porterie
6e85b81df2
Merge pull request #23614 from icecrime/inspect_services
...
Allow `docker inspect` on all types
2016-08-26 18:45:23 +00:00
yuexiao-wang
9e66ddaf3d
Add the content for Google Cloud Loging driver in index
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-26 17:30:32 +08:00
Vincent Demeester
48ff20c795
Merge pull request #26016 from vdemeester/docs-restart-policy-api-changes
...
Update docker remote api to mention restart policy validation
2016-08-26 07:57:53 +02:00
Vincent Demeester
72e7cd75c1
Merge pull request #25919 from yuexiao-wang/fix-refer
...
Remove the redundant words in reference for swarm
2016-08-26 07:57:07 +02:00
Victor Vieux
63a19edcb1
add -f to plugin inspect
...
Signed-off-by: Victor Vieux <vieux@docker.com>
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-25 22:40:05 -07:00
Yong Tang
5118dd2992
Update documentation for validation of --ip
and ip6
.
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-25 22:11:56 -07:00
Doug Davis
91ec7fa811
Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm
...
Update docs for `docker create` to include `--rm` flag
2016-08-26 09:06:30 -04:00
Antonio Murdaca
91fdafb79f
Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged
...
Fixes #25918 - Changed --permissive to --privileged.
2016-08-26 12:06:58 +02:00
Yong Tang
d7468cff4d
Update docs for docker create
to include --rm
flag
...
Since 20848 has been merged and both `docker create` and
`docker run` share the same `runconfig` parser, now both
`docker run` and `docker create` allow to specify the
`--rm` flag. However, docs for `docker create` has not
been udpated yet.
This fix updates docs for `docker create` so that `--rm`
flag has been included.
This fix is related to 20848 and 25577.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-25 22:05:38 -07:00
Victor Vieux
cf4e268115
replace active by enabled for consistency in plugins
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-08-25 20:42:49 -07:00
yuexiao-wang
8bcc8ebacc
Remove the redundant description
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-26 08:36:34 +08:00
Arnaud Porterie (icecrime)
3db9f7afce
Refactor docker inspect
to work on all types
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-08-25 16:29:08 -07:00
Kara Alexandra
ba3f0bf0e7
Add option to specify name without --name in volume create
...
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
2016-08-25 14:20:06 -07:00
Rich Moyse
b63ce3305c
Fixes #25918 - Changed --permissive to --privileged.
...
Signed-off-by: Rich Moyse <rich@moyse.us>
2016-08-25 16:49:37 -04:00
Vincent Demeester
4e4ebbe340
Merge pull request #25896 from raksonibs/fix/docs_step_6
...
Email deprecation for step 6 of tutorial
2016-08-25 21:06:20 +02:00
Oskar Niburski
fbe222a35b
Remove Username and Password prompt with login for Step six.
...
Signed-off-by: Oskar Niburski <oskarniburski@gmail.com>
2016-08-25 14:23:45 -04:00
Charles Smith
dee3044336
Merge pull request #25781 from sfsmithcha/add_ingress_guide
...
author merge: add ingress / publish port guide
2016-08-25 10:06:11 -07:00
Charles Smith
465fd93f1c
add ingress / publish port guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-25 09:24:45 -07:00
Alexander Morozov
78771b6225
Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
...
Splunk Logging Driver: formats and verifyconnection
2016-08-25 09:12:31 -07:00
Vincent Demeester
a011a94be7
Update docker remote api to mention restart policy validation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-08-25 17:03:18 +02:00
yuexiao-wang
530668cb22
Replace docker command from 'docker daemon' to 'dockerd'
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-25 17:04:44 +08:00
yuexiao-wang
ad4efd3349
Modify incorrect repository URL
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-08-24 10:09:33 +08:00
Vincent Demeester
602b238136
Merge pull request #25948 from lixiaobing10051267/masterImages
...
get a redis-cli image while using docker pull
2016-08-23 21:44:26 +02:00
Tõnis Tiigi
0b2ff0ccde
Merge pull request #25946 from lixiaobing10051267/masterDockerImages
...
Incorrect response field name for command "docker images"
2016-08-23 11:19:52 -07:00
Vincent Demeester
442da0d8aa
Merge pull request #25793 from yuexiao-wang/clean-makefile
...
Clean up the Makefile
2016-08-23 09:43:25 +02:00
lixiaobing10051267
4f7195e3c9
get a redis-cli image using docker pull
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-23 14:44:37 +08:00
lixiaobing10051267
8eae3ceab8
Incorrect response field name for command "docker images"
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-23 14:24:31 +08:00