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
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
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
ea8723156f
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 >
Upstream-commit: 566c2c9d3236b0adffaca425db5d4bac66ba8c1c
Component: engine
2016-08-26 15:42:45 -07: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
d64a2f9915
Add the content for Google Cloud Loging driver in index
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 9e66ddaf3d01f6c94f33b96a790ee9171086f380
Component: engine
2016-08-26 17:30:32 +08:00
2056c2799d
Merge pull request #26016 from vdemeester/docs-restart-policy-api-changes
...
Update docker remote api to mention restart policy validation
Upstream-commit: 48ff20c79527096ab8ca9c4be6773e4133afc617
Component: engine
2016-08-26 07:57:53 +02:00
2aa34a7405
Merge pull request #25919 from yuexiao-wang/fix-refer
...
Remove the redundant words in reference for swarm
Upstream-commit: 72e7cd75c1f7a636b48774c3ba189cc8fd510138
Component: engine
2016-08-26 07:57:07 +02: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
0c629aa456
Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm
...
Update docs for `docker create` to include `--rm` flag
Upstream-commit: 91ec7fa811c7476b7c20e3b95a92ea9062d498fa
Component: engine
2016-08-26 09:06:30 -04:00
908de2cc1b
Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged
...
Fixes #25918 - Changed --permissive to --privileged.
Upstream-commit: 91fdafb79f1532de33e2e258446d6eab80fd0d53
Component: engine
2016-08-26 12:06:58 +02:00
32f7fca331
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 >
Upstream-commit: d7468cff4d672f118cb12a6b169c3098ea620b7e
Component: engine
2016-08-25 22:05:38 -07:00
e44f33953e
replace active by enabled for consistency in plugins
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: cf4e268115911e9e4a4da94dc00b2dc370f86a47
Component: engine
2016-08-25 20:42:49 -07:00
c482fb6e34
Remove the redundant description
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 8bcc8ebaccee981330a2e9b2bc9ad17c3a460d5d
Component: engine
2016-08-26 08:36:34 +08:00
83ee5a765b
Refactor docker inspect to work on all types
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 3db9f7afce03b1926fd6ba22483ebf0d76d2a1da
Component: engine
2016-08-25 16:29:08 -07:00
346f8a271b
Add option to specify name without --name in volume create
...
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com >
Upstream-commit: ba3f0bf0e7d4f94eb94023278adcfad4ca8fe9d7
Component: engine
2016-08-25 14:20:06 -07:00
de5170b89d
Fixes #25918 - Changed --permissive to --privileged.
...
Signed-off-by: Rich Moyse <rich@moyse.us >
Upstream-commit: b63ce3305c1dd3aec307bbe3bfe0aead295137cb
Component: engine
2016-08-25 16:49:37 -04:00
9aa1f9aa60
Merge pull request #25896 from raksonibs/fix/docs_step_6
...
Email deprecation for step 6 of tutorial
Upstream-commit: 4e4ebbe34040f557775b59d111a8127f1f7df9a2
Component: engine
2016-08-25 21:06:20 +02:00
e00aee44c1
Remove Username and Password prompt with login for Step six.
...
Signed-off-by: Oskar Niburski <oskarniburski@gmail.com >
Upstream-commit: fbe222a35b764025f2585e65fd9119fa92359d4c
Component: engine
2016-08-25 14:23:45 -04:00
8d1480427f
Merge pull request #25781 from sfsmithcha/add_ingress_guide
...
author merge: add ingress / publish port guide
Upstream-commit: dee30443368b9ed8046733242410b8c32550ce0d
Component: engine
2016-08-25 10:06:11 -07:00
96374eb25c
add ingress / publish port guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 465fd93f1ca474320f8ef0082483b05c3bb48d7b
Component: engine
2016-08-25 09:24:45 -07:00
a0d759f31d
Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json
...
Splunk Logging Driver: formats and verifyconnection
Upstream-commit: 78771b62255456bef110a3e310eb20165e5ece9f
Component: engine
2016-08-25 09:12:31 -07:00
d13d215017
Update docker remote api to mention restart policy validation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a011a94be7448ee86e28396246de73f646af3a93
Component: engine
2016-08-25 17:03:18 +02:00
c65cef03da
Replace docker command from 'docker daemon' to 'dockerd'
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 530668cb2262fc89e60a23d9a0f6555498b0171b
Component: engine
2016-08-25 17:04:44 +08:00
9759475f7f
Modify incorrect repository URL
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: ad4efd334962b21f287cf02f2685403ae64a3659
Component: engine
2016-08-24 10:09:33 +08:00
c167cd9e31
Merge pull request #25948 from lixiaobing10051267/masterImages
...
get a redis-cli image while using docker pull
Upstream-commit: 602b2381360cf59fffe46b64bb4bdfa180639c44
Component: engine
2016-08-23 21:44:26 +02:00
1c5ac9c7e1
Merge pull request #25946 from lixiaobing10051267/masterDockerImages
...
Incorrect response field name for command "docker images"
Upstream-commit: 0b2ff0ccdef3327e52699941b2ab888f7fbecb1e
Component: engine
2016-08-23 11:19:52 -07:00
94a1c4d159
Merge pull request #25793 from yuexiao-wang/clean-makefile
...
Clean up the Makefile
Upstream-commit: 442da0d8aa0538ec495881016b6516f59b6f4d63
Component: engine
2016-08-23 09:43:25 +02:00
492b23bc87
get a redis-cli image using docker pull
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 4f7195e3c91903c23e9e36c57955ca60fe0e71fa
Component: engine
2016-08-23 14:44:37 +08:00
7eccfab5d7
Incorrect response field name for command "docker images"
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 8eae3ceab8acbbd5b842f642bd12377bec4b5606
Component: engine
2016-08-23 14:24:31 +08:00
6d0358a080
Merge pull request #25931 from fj/patch-1
...
Fix minor typo in "Getting Started" documentation
Upstream-commit: a949a79a5899df2b57c0ff3e6a3e9aa432db248c
Component: engine
2016-08-22 21:53:47 -05:00
9ccbe410f0
Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager
...
Remove option "--manager" description for swarm_join.md
Upstream-commit: 7cd88e5ec4fc13e1ded0eb7c565ed299b46c8259
Component: engine
2016-08-22 13:13:21 -07:00
744ac1e4d5
Fix minor typo in "Docker Engine runs navitvely"
...
Signed-off-by: John Feminella <jxf@jxf.me >
Upstream-commit: 435bc9d9898febc8b9c16a02e4114745a52374fc
Component: engine
2016-08-22 15:43:26 -04:00
f7b9cff570
Remove option "--manager" description for swarm_join.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 344d7f773d10d429b39c8e4e5c7426d4d1998300
Component: engine
2016-08-22 15:42:38 +08:00
