f6b8936533
Merge pull request #24850 from yongtang/24270-service-tasks-filter
...
Fix partial/full filter issue in `service tasks --filter`
Upstream-commit: b0e1b8fc79af0baf5d90329254aacbdfb4188bfc
Component: engine
2016-09-28 11:50:27 +02:00
d295583beb
Update docs for service ps
...
This fix updates docs for `service ps` as now the TASK ID part has been
removed.
Also, this fix fixes several incorrect sample output.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 880a5f565fb33b445977bb2ded0fc375edee0c40
Component: engine
2016-09-27 19:12:48 -07:00
95fdcb0f29
added better Docker Machine links to Swarm tutorial d4mac, d4win, copyedits
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com >
Upstream-commit: 0a76a4cb5bdb83c1c62832d084ae47a0c50646bc
Component: engine
2016-09-27 14:21:17 -07:00
99ee0aae26
add endpoint mode in service pretty
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 70bb832060ae1a0525a34145f85e68e0da78fcb9
Component: engine
2016-09-27 18:41:19 +08:00
8cdfc4f743
Merge pull request #26902 from yuexiao-wang/add-index
...
Add menu for How PKI works
Upstream-commit: afd22d27c3674d24458dbc530edd609e41b0f7ab
Component: engine
2016-09-26 21:20:30 +02:00
2e2fa7e352
Merge pull request #26907 from yuexiao-wang/fix-typo
...
Fix typo for how pki works
Upstream-commit: 2a8b556ea50d080878dc42a25c9b1a4356d840a5
Component: engine
2016-09-26 11:58:19 +02:00
dee86cf062
Fix the broken link
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: cfb07e642d23622412c5455ca70c42140268f9fe
Component: engine
2016-09-26 15:03:56 +08:00
d3c94f4001
Fix typo for how pki works
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: bf9c6d3115dd388cf379ec1a80d29104521a7b42
Component: engine
2016-09-26 14:28:31 +08:00
92623de9dd
Add menu for How PKI works
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: c228931384c7a0eb143cba3a4a4804daa6f79eee
Component: engine
2016-09-26 14:17:47 +08:00
a045d7b33b
the network id is not consistant with the real id created
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 392aae44fd8ea5755305104e1c2a1c85f39d4a07
Component: engine
2016-09-23 17:40:55 +08:00
c4f625455b
updates swarm overlay network diagram
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 48f3aa7805fc935d1c07f9c697edcb6b274252da
Component: engine
2016-09-09 15:18:53 -07: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
565ec12cc7
add how pki works topic
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 5ca3e6e61f5537fa637de9436881402a929bea77
Component: engine
2016-09-06 10:39:52 -07:00
af4e81149a
typo
...
Signed-off-by: Javier Bassi <javierbassi@gmail.com >
Upstream-commit: 682a8ecb8b77e35745c1720b9c9ee9a5fe885fa4
Component: engine
2016-08-30 19:46:07 -03: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
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
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
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
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
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
968533071a
Merge pull request #25899 from yuexiao-wang/fix-overview
...
Optimize description for Feature highlights
Upstream-commit: d2fa978d4d66622a197eb98f9a77fa217e25f449
Component: engine
2016-08-22 09:17:32 +02:00
bdc88f8035
Merge pull request #25901 from yuexiao-wang/add-content
...
Add the content for how services work
Upstream-commit: abd08f4784810bcf8b4e88e3f9ef1023cb15b8b5
Component: engine
2016-08-22 11:58:30 +10:00
08af9769e8
Add the content for how services work
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 2b0892c02eb50c20e8752643faf558dd150dbc77
Component: engine
2016-08-20 17:32:29 +08:00
e22764bf9f
Optimize description for Feature highlights
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: dde0f86a88989c02256a8b301ff8388752d88eed
Component: engine
2016-08-20 16:24:18 +08:00
48a77b1711
It is orchestrator not scheduler to create swarm task
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: cb9dfd391ba4df5c34f83f5070e0b685c99bf591
Component: engine
2016-08-19 17:02:00 +08:00
c4f46bb88f
Check the return message of docker service inspect
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 68ef2569842f8ca4dd09a85caca1970d95946547
Component: engine
2016-08-16 14:47:13 +08:00
fc75fb9bbd
Merge pull request #25700 from lixiaobing10051267/masterSwarmRmService
...
command "docker service remove" not consistent
Upstream-commit: bfc3f121f10f0dd17833ee1f2d8ccd8b7dcafa5f
Component: engine
2016-08-15 09:55:52 -04:00
9716ade879
command "docker service remove" not insistant
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 078e2aa1571ad402f0a9599e6fac2286a3d35f54
Component: engine
2016-08-15 15:11:37 +08:00
a863701de5
add overlay networking guide
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: e56dd0e0e7d2eb921390c7aaff091b8b613c4c6b
Component: engine
2016-08-12 15:18:21 -07:00
78c72ac827
Merge pull request #25611 from lixiaobing10051267/masterJoin
...
docker swarm join command has no flag '--swarm-token'
Upstream-commit: f1101ebf3e8fed953528c30bb7d329857fb58805
Component: engine
2016-08-11 13:30:07 +02:00
ea7fd73f3c
docker swarm join command has no flag 'X--swarm-token'
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fcf732117df0d4a57202cc056ee9c24749745bd4
Component: engine
2016-08-11 19:49:38 +08:00
ed03b3e574
Merge pull request #25610 from lixiaobing10051267/masterSwarm
...
optimize some descriptions for swarm nodes.md
Upstream-commit: 81fca603a4c828a7bca882cd504cc32b0a7b0d1d
Component: engine
2016-08-11 13:29:47 +02:00
a0f2fd5022
optimize some descriptions for swarm nodes.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: fa52bd5cf8f8e40189a0a9ba1bac61bd5ace4a91
Component: engine
2016-08-11 19:07:56 +08:00
46019ac375
Update example output for node inspect
...
commit 41d580c7a610d8111dc63353cbd94319ca854627 added
"Joined at" to the output of node inspect,
but I forgot that docs changes are needed.
This change updates the example output
of node inspect in the documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dcb052c12bf6e67184d0cb6a69daf39c25666cfe
Component: engine
2016-08-09 13:04:35 +02:00
0993849fc3
fix overlay network example
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 0277eb9a32d96e11cbfe3c98229008ad29392a3f
Component: engine
2016-08-08 14:08:10 -07:00
8b07fc75ff
Fix typo for docker swarm description
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: eb4b965ddbe0c351df45dfd81b32c08c7194d804
Component: engine
2016-08-08 14:47:15 +08:00
7a49d47322
add force remove to admin guide, clean up usage of Raft, cluster -> swarm, fix some organization
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 6c38e6877aa4cfddee018a5bdfee6a9bbcbcc646
Component: engine
2016-08-05 17:27:10 -07:00
7ad5ac8d06
update D4M D4W advisory in swarm tutorial
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: bd15725519453b13802f1b94f2d61ec04b73d266
Component: engine
2016-08-05 09:13:39 -07:00
4183fa25d5
Remove "-rc" from documentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4f7b731a26bf43c03687fab35c2f30cfd827bade
Component: engine
2016-08-05 01:38:18 +02:00
e9fa1f29b7
Fix service ps output format in swarm tutorial
...
These changes update the example output for `docker service ps` in the
swarm tutorial's rolling update and node draining sections to match that
produced by 1.12.0: shutdown tasks are listed and the column order and
naming has changed.
Signed-off-by: Ilkka Laukkanen <ilkka@ilkka.io >
Upstream-commit: da56fa26990aa957c9bdc5497b9856f8aff58636
Component: engine
2016-08-04 13:01:22 +03:00
8ea3665947
Merge pull request #25282 from clhlc/clhlc-patch-1
...
Update swarm-mode.md
Upstream-commit: 181f5ac6276fd47a81ea0931c4fd170ceb3508ed
Component: engine
2016-08-02 13:06:24 -07:00
f03613aded
Improve swarm join-token instructions
...
this change improves the instructions for
swarm join-token and swarm init;
- only print the join-token command for workers
instead of for both managers and workers, to
prevent users from copying the wrong command.
An extra line is added to explain how to obtain
the manager token.
- print a message that a token was rotated
sucesfully if '--rotate' is used.
- add some extra white-space before / after
the join commands, to make copy/pasting
easier.
this change also does some refactoring of join-token;
- move flagname-constants together with other constants
- use variables for selected role ("worker" / "manager")
to prevent checking for them multiple times, and to
keep the "worker" / "manager" sting centralized
- add an extra blank line after "join-token" instructions
this makes it easier to copy, and cleans up the
code a tiny bit
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ebebd4176940bc907ba4e8f5fbe62f6a050f8ed4
Component: engine
2016-08-02 16:44:02 +02:00
d3a8f088ac
Update swarm-mode.md
...
Signed-off-by: lichao <lichao@papayamobile.com >
Upstream-commit: 4f1a57a8e14a3ce7d572434020e231e072eb9e13
Component: engine
2016-08-02 11:36:32 +08:00
9027f05cc9
Merge pull request #25265 from adamwalz/docs_swarm_cluster_fault_tolerance
...
Fix swarm manager node fault tolerance table
Upstream-commit: ceb4126aa0cfcaf7842d22351876dc35dff915b3
Component: engine
2016-08-01 18:31:46 -07:00
59a9a5fe59
Fix swarm manager node fault tolerance table
...
In a cluster of 4 nodes, with a majority being 3 nodes, the fault
tolerance should be 1 node.
Signed-off-by: Adam Walz <adam@adamwalz.net >
Upstream-commit: 18d0c3933bec7fc1dc5ee8d4d1bc15235d86eeca
Component: engine
2016-07-30 21:20:54 -06:00
aedbd97f20
Give the correct link of docker swarm init
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: e8279afb1a9439b482d9e3a66dcc46f155aa5251
Component: engine
2016-07-30 16:33:43 +08:00
5473a6ca58
Merge pull request #25182 from sfsmithcha/clarify_join_token
...
Author Merge add advertise address, clarify join token
CI errors expected.
Upstream-commit: ee355e017d210bef02771a8de4733f820ae6b717
Component: engine
2016-07-29 16:10:20 -07:00
a28554905f
add advertise address, clarify join token
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 1e7219d40fcd3b9e3ef6d224e2926d5562fb7b74
Component: engine
2016-07-29 15:45:34 -07:00
95e7541ee8
Merge pull request #25197 from sfsmithcha/add_services_guide
...
author merge: add services guide to manage a swarm
Upstream-commit: 8b69d50c79f75f670fdc87e3e19c651551726605
Component: engine
2016-07-29 15:33:34 -07:00
