Commit Graph

5671 Commits

Author SHA1 Message Date
6d26e235fc Merge pull request #25105 from hqhq/fix_kmem_test
Fix TestUpdateKernelMemoryUninitialized on new kernel version
Upstream-commit: b47df1ddbe847bdffccb76239e3288d59b69cb3b
Component: engine
2016-08-02 17:15:53 +02:00
6ae69a861f Merge pull request #25318 from lixiaobing10051267/masterParentheses
A parenthesis omitted in Seccomp.md
Upstream-commit: d7c9c85e3093cef9e014be12951d226ab45bbba6
Component: engine
2016-08-02 12:27:19 +02:00
919b659026 Fix kernel memory updating docs
Specify that kernel memory updating limitation only applies
on kernel version older than 4.6.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 59069ba29a9a16c7679bed4cbf2e9d477363aa79
Component: engine
2016-08-02 13:36:58 +08:00
d7f691cfe1 A parenthesis omitted in Seccomp.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 227cae6680d9c2ff8b1583ab4efdec54bdc36688
Component: engine
2016-08-02 12:24:15 +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
fba16f2b3f Merge pull request #25205 from lixiaobing10051267/masterPath
Give the correct link of docker swarm init
Upstream-commit: 93fea86d1da9088899481519412070e2207cfd40
Component: engine
2016-08-01 11:34:54 -07:00
35c6396c21 add status code 409 in attach in docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b22a2919311fe0aaeb8802756f55486b8b020b2a
Component: engine
2016-08-01 01:21:50 +08:00
6b17dbd4f5 Merge pull request #25240 from allencloud/update-command-description-in-CLI
update command description in CLI
Upstream-commit: 849807d89a349db0f869a37c393203d812109d58
Component: engine
2016-07-31 12:56:23 +02:00
c5445bc4bb Merge pull request #25239 from dlech/patch-1
Make it clear which parmeter is the user
Upstream-commit: c7fcf496af8f7f5a6f3ab5397857ecfe91cbc192
Component: engine
2016-07-31 08:54:53 +02: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
b87e70e358 update command description in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6c5988ed8c654527ee8dbae26d5618297f038cef
Component: engine
2016-07-31 00:06:18 +08: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
6867071d80 Make it clear which parmeter is the user
Using the environment variable here also has the advantage that it can be copied and pasted directly in a terminal and it will work.

Signed-off-by: David Lechner <david@lechnology.com>
Upstream-commit: e10ba68bfdbedb47b7e92c3aee5e66e5884d16c3
Component: engine
2016-07-29 19:08:20 -05: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
48f7f6f55e add services guide to manage a swarm
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 861d4dc989ae738a1c219291a96333a7577b1699
Component: engine
2016-07-29 15:01:52 -07:00
c45216ee6a Merge pull request #24535 from thaJeztah/minor-docs-fixup
docs: cleanup docker update docs
Upstream-commit: 498cd1742789481b5c9d75537d29d5f92ed9f20c
Component: engine
2016-07-29 02:53:01 +02:00
bced48a04a Merge pull request #25034 from thaJeztah/update-swarm-usage
Update usage of "Swarm" for consistency
Upstream-commit: c388a5bdfa922d85373cc8a77a08612ca4b67861
Component: engine
2016-07-29 01:01:00 +01:00
e1bdcf299e Merge pull request #25152 from thaJeztah/re-enable-api-1.25
docs: re-enable API 1.25
Upstream-commit: 193b03615957e0aa41dbb5e675ab3530a501adb1
Component: engine
2016-07-28 09:38:20 +02:00
7fc346bc16 Merge pull request #25020 from jfrazelle/update-non-events
update security non-events
Upstream-commit: 14664beda923dc9249cbd4ac4f024319668e57c0
Component: engine
2016-07-28 09:29:51 +02:00
77366c6416 modifed d4mac and d4win download links to stable for v1.12
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: ef528abcda1a4a7a1b605b57b56c5f3b630146bc
Component: engine
2016-07-27 18:57:38 -07:00
6a47f2d601 docs: re-enable API 1.25
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2b9838eafed6c9f56a47fecc997cdef9b0203e9a
Component: engine
2016-07-28 02:11:34 +02:00
c5246dacc1 update non-events
Signed-off-by: Jess Frazelle <jessfraz@google.com>
Upstream-commit: 6837cfc13cba842186a7261aa9bbd3a8755fd11e
Component: engine
2016-07-27 19:21:16 -04:00
aa7e6b8845 Update usage of "Swarm" for consistency
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0230049f0afd318217c60ebe486aab3b54538fd
Component: engine
2016-07-27 23:31:55 +02:00
ae11b0dc77 Merge pull request #24816 from stevvooe/service-ps-over-tasks
cli: `docker service|node|stack ps` instead of tasks
Upstream-commit: 1a7d339d3698d13a4cf9592e8e73df27bf43664f
Component: engine
2016-07-27 23:13:28 +02:00
3cd473134d Merge pull request #24760 from anusha-ragunathan/plugin-events
Make daemon events listen for plugin lifecycle events.
Upstream-commit: 297745b1cdfb79a12986465f8150e22b0018c640
Component: engine
2016-07-27 13:36:49 -07:00
6a1ceaa1e1 cli: docker service|node|stack ps instead of tasks
Rather than conflict with the unexposed task model, change the names of
the object-oriented task display to `docker <object> ps`. The command
works identically to `docker service tasks`. This change is superficial.

This provides a more sensical docker experience while not trampling on
the task model that may be introduced as a top-level command at a later
date.

The following is an example of the display using `docker service ps`
with a service named `condescending_cori`:

```
$ docker service ps condescending_cori
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 13 minutes ago  Running        6c6d232a5d0e
```

The following shows the output for the node on which the command is
running:

```console
$ docker node ps self
ID                         NAME                  SERVICE             IMAGE   LAST STATE              DESIRED STATE  NODE
b1tpbi43k1ibevg2e94bmqo0s  mad_kalam.1           mad_kalam           apline  Accepted 2 seconds ago  Accepted       6c6d232a5d0e
e2cd9vqb62qjk38lw65uoffd2  condescending_cori.1  condescending_cori  alpine  Running 12 minutes ago  Running        6c6d232a5d0e
4x609m5o0qyn0kgpzvf0ad8x5  furious_davinci.1     furious_davinci     redis   Running 32 minutes ago  Running        6c6d232a5d0e
```

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 0aa4e1e68973ede0c73f8a4356e2a17fc903f549
Component: engine
2016-07-27 11:06:42 -07:00
6c0a8ccd7a update rolling update tutorial to reflect default parallelism and update on failure
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 6440cacd49226e97b2dcb64eb31cb32b87b1ff18
Component: engine
2016-07-27 09:36:05 -07:00
69eee2ec52 Merge pull request #25120 from thaJeztah/put-back-1.12-links
Add back links to 1.12 release in deprecated.md
Upstream-commit: 296378d575f8111ba4a831c2d03baa21ed30582d
Component: engine
2016-07-27 21:48:10 +10:00
cb17293750 Merge pull request #25119 from thaJeztah/pre-1.12-ga-fixes
Remove release-candidate advisories
Upstream-commit: 415ef83e02a11a086128d2247e09c72e22a09406
Component: engine
2016-07-27 21:43:37 +10:00
ef4baa67b4 Add back links to 1.12 release in deprecated.md
These links were temporarily changed, because the
docs were published before the 1.12.0 tag was
available.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: cd69b94241b94d16ac6dfad6e6bc7fc981dc2cca
Component: engine
2016-07-27 11:30:42 +02:00
07a9303505 Remove release-candidate advisories
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 053ac127ab0f784bebeda38f29f2d7615d2ffcb8
Component: engine
2016-07-27 11:24:16 +02:00
669220f611 fix minor docs issues
this brings back the trailing whitespace in "runmetrics",
that were there intentially to force a line-break

also removes a duplicate redirect, that was present
on two pages

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d8434eba462752327d4c7769d3ce2c85013c211e
Component: engine
2016-07-27 11:09:57 +02:00
b404d167d7 Merge pull request #24970 from sfsmithcha/daemonless_containers
add doc for live-restore setting and daemonless containers, fix admin…
Upstream-commit: d8c9fd0af9be3e937ec0520e0dcbe9a80eb321c4
Component: engine
2016-07-27 11:00:15 +02:00
b8668fb50c Merge pull request #24955 from sfsmithcha/add_how_services_work
add how services work to how swarm mode works guide
Upstream-commit: 59e341667fdf24f8de7af7337dceea196d816457
Component: engine
2016-07-27 10:59:08 +02:00
e1f945a9c5 Merge pull request #25083 from mapk0y/fix-doc-ipaddress
fixes the ipaddress of the explanation.
Upstream-commit: 3b8ef038c10e0dbf624b44498d8832d0e189ed71
Component: engine
2016-07-26 16:07:51 -04:00
4695440d40 Merge pull request #25076 from sfsmithcha/add_manage_nodes_guide
author merge: add swarm manage nodes guide
Upstream-commit: 08d1995fbf166cf5d6a0db5f37a11af8d28ee9f3
Component: engine
2016-07-26 11:33:46 -07:00
3bf48fb858 fix the ipaddress of an explanation.
Signed-off-by: mapk0y <mapk0y@gmail.com>
Upstream-commit: a94b48923e8ec7a5e9ebe6101f0ccac208fb4f25
Component: engine
2016-07-27 03:17:32 +09:00
062b507351 Make daemon events listen for plugin lifecycle events.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 42abccb841b5bc0d420044e69165852b0054c38f
Component: engine
2016-07-26 10:51:47 -07:00
305bc09342 add how services work to how swarm mode works guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: bef36fba4022e1c37f1f21e9e265e7f98e2f7f65
Component: engine
2016-07-26 10:44:19 -07:00
faa1d07424 add swarm manage nodes guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 704facbbab0af520e0429eb75a6f875b6015a77c
Component: engine
2016-07-26 10:25:05 -07:00
0750a492c1 Add container labels to service create/update
Swarm mode makes it possible through the API to set labels to containers
but not through command line. This tries to fix it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4031d70d1be2f02e1c9d6f7738f2a816be7eeef2
Component: engine
2016-07-25 18:57:02 -07:00
11cd397072 healthcheck: do not interpret exit code 2 as "starting"
Instead reserve exit code 2 to be future proof, document that it should
not be used. Implementation-wise, it is considered as unhealthy, but
users should not rely on this as it may change in the future.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 91e9f3831330c63f8351b9fc3f7c31b3229505be
Component: engine
2016-07-25 14:28:45 -07:00
e6c9a862fe swarm docs: add administration guide for Managers and Raft
This adds a guide with recommendations on how to setup
Managers and keep the Swarm cluster healthy.

Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
Upstream-commit: 24f87f26e73a49383e0606813a86ed96da7f5a18
Component: engine
2016-07-25 10:25:33 -07:00
68e6d452a1 Merge pull request #24207 from sfsmithcha/add_swarm_mode_guide
add run swarm mode guide
Upstream-commit: caedb3f827335532a4b0aa9bebc56223dbc53aa7
Component: engine
2016-07-25 19:21:01 +02:00
614fc25c93 Merge pull request #24943 from aaronlehmann/rolling-updates
Add failure action for rolling updates
Upstream-commit: c65925f24baf98455c211b4eb5c408daaaefb07a
Component: engine
2016-07-25 10:15:28 -07:00
3bb81734cb Merge pull request #25012 from aanand/entrypoint-note
Add note about --entrypoint overriding default command
Upstream-commit: 131557309302fe237276a479b55a75507f21d41c
Component: engine
2016-07-25 19:11:24 +02:00
23a8cb555d add run swarm mode guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: c406711cc0c5c47f2a36a54becae49c24e0c31c9
Component: engine
2016-07-25 10:10:11 -07:00
43f9433150 add doc for live-restore setting and daemonless containers, fix admin guide menu
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: cbd07495a3c5b49a47ea288a9e6ee9b24800cace
Component: engine
2016-07-25 09:29:57 -07:00