Commit Graph

5675 Commits

Author SHA1 Message Date
Vincent Demeester
3d28cdd2f5 Merge pull request #25308 from thaJeztah/join-token-refactor
Improve swarm join-token instructions
2016-08-02 18:57:37 +02:00
Vincent Demeester
50c08f0f09 Merge pull request #25330 from yongtang/docs-service-create-update-user
Update docs in `docker service create/update` for flag `--user`
2016-08-02 17:58:39 +02:00
Sebastiaan van Stijn
b47df1ddbe Merge pull request #25105 from hqhq/fix_kmem_test
Fix TestUpdateKernelMemoryUninitialized on new kernel version
2016-08-02 17:15:53 +02:00
Sebastiaan van Stijn
ebebd41769 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>
2016-08-02 16:44:02 +02:00
Yong Tang
80a3755a8f Update docs in docker service create/update for flag --user
In `docker service create/update`, flag `--user` actually supports
`uid:gid` (same as `docker run`). However, this is not reflected
in the help and documentation yet.

This fix updates docs in `docker service create/update` to change
the description to `Username or UID (format: <name|uid>[:<group|gid>])`.

The help message output has also been updated.

This fix is related to 25304.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-08-02 07:01:16 -07:00
Sebastiaan van Stijn
d7c9c85e30 Merge pull request #25318 from lixiaobing10051267/masterParentheses
A parenthesis omitted in Seccomp.md
2016-08-02 12:27:19 +02:00
Qiang Huang
59069ba29a 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>
2016-08-02 13:36:58 +08:00
lixiaobing10051267
227cae6680 A parenthesis omitted in Seccomp.md
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-08-02 12:24:15 +08:00
Tõnis Tiigi
ceb4126aa0 Merge pull request #25265 from adamwalz/docs_swarm_cluster_fault_tolerance
Fix swarm manager node fault tolerance table
2016-08-01 18:31:46 -07:00
Charles Smith
93fea86d1d Merge pull request #25205 from lixiaobing10051267/masterPath
Give the correct link of docker swarm init
2016-08-01 11:34:54 -07:00
allencloud
b22a291931 add status code 409 in attach in docs
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-08-01 01:21:50 +08:00
Vincent Demeester
849807d89a Merge pull request #25240 from allencloud/update-command-description-in-CLI
update command description in CLI
2016-07-31 12:56:23 +02:00
Vincent Demeester
c7fcf496af Merge pull request #25239 from dlech/patch-1
Make it clear which parmeter is the user
2016-07-31 08:54:53 +02:00
Adam Walz
18d0c3933b 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>
2016-07-30 21:20:54 -06:00
allencloud
6c5988ed8c update command description in CLI
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-07-31 00:06:18 +08:00
lixiaobing10051267
e8279afb1a 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>
2016-07-30 16:33:43 +08:00
David Lechner
e10ba68bfd 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>
2016-07-29 19:08:20 -05:00
Charles Smith
ee355e017d Merge pull request #25182 from sfsmithcha/clarify_join_token
Author Merge add advertise address, clarify join token

CI errors expected.
2016-07-29 16:10:20 -07:00
Charles Smith
1e7219d40f add advertise address, clarify join token
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-29 15:45:34 -07:00
Charles Smith
8b69d50c79 Merge pull request #25197 from sfsmithcha/add_services_guide
author merge: add services guide to manage a swarm
2016-07-29 15:33:34 -07:00
Charles Smith
861d4dc989 add services guide to manage a swarm
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-29 15:01:52 -07:00
Sebastiaan van Stijn
498cd17427 Merge pull request #24535 from thaJeztah/minor-docs-fixup
docs: cleanup docker update docs
2016-07-29 02:53:01 +02:00
Justin Cormack
c388a5bdfa Merge pull request #25034 from thaJeztah/update-swarm-usage
Update usage of "Swarm" for consistency
2016-07-29 01:01:00 +01:00
Sebastiaan van Stijn
193b036159 Merge pull request #25152 from thaJeztah/re-enable-api-1.25
docs: re-enable API 1.25
2016-07-28 09:38:20 +02:00
Sebastiaan van Stijn
14664beda9 Merge pull request #25020 from jfrazelle/update-non-events
update security non-events
2016-07-28 09:29:51 +02:00
Victoria Bialas
ef528abcda modifed d4mac and d4win download links to stable for v1.12
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-07-27 18:57:38 -07:00
Sebastiaan van Stijn
2b9838eafe docs: re-enable API 1.25
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-28 02:11:34 +02:00
Jess Frazelle
6837cfc13c update non-events
Signed-off-by: Jess Frazelle <jessfraz@google.com>
2016-07-27 19:21:16 -04:00
Sebastiaan van Stijn
f0230049f0 Update usage of "Swarm" for consistency
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-27 23:31:55 +02:00
Sebastiaan van Stijn
1a7d339d36 Merge pull request #24816 from stevvooe/service-ps-over-tasks
cli: `docker service|node|stack ps` instead of tasks
2016-07-27 23:13:28 +02:00
Michael Crosby
297745b1cd Merge pull request #24760 from anusha-ragunathan/plugin-events
Make daemon events listen for plugin lifecycle events.
2016-07-27 13:36:49 -07:00
Stephen J Day
0aa4e1e689 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>
2016-07-27 11:06:42 -07:00
Charles Smith
6440cacd49 update rolling update tutorial to reflect default parallelism and update on failure
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-27 09:36:05 -07:00
Sven Dowideit
296378d575 Merge pull request #25120 from thaJeztah/put-back-1.12-links
Add back links to 1.12 release in deprecated.md
2016-07-27 21:48:10 +10:00
Sven Dowideit
415ef83e02 Merge pull request #25119 from thaJeztah/pre-1.12-ga-fixes
Remove release-candidate advisories
2016-07-27 21:43:37 +10:00
Sebastiaan van Stijn
cd69b94241 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>
2016-07-27 11:30:42 +02:00
Sebastiaan van Stijn
053ac127ab Remove release-candidate advisories
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-27 11:24:16 +02:00
Sebastiaan van Stijn
d8434eba46 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>
2016-07-27 11:09:57 +02:00
Sebastiaan van Stijn
d8c9fd0af9 Merge pull request #24970 from sfsmithcha/daemonless_containers
add doc for live-restore setting and daemonless containers, fix admin…
2016-07-27 11:00:15 +02:00
Sebastiaan van Stijn
59e341667f Merge pull request #24955 from sfsmithcha/add_how_services_work
add how services work to how swarm mode works guide
2016-07-27 10:59:08 +02:00
Brian Goff
3b8ef038c1 Merge pull request #25083 from mapk0y/fix-doc-ipaddress
fixes the ipaddress of the explanation.
2016-07-26 16:07:51 -04:00
Charles Smith
08d1995fbf Merge pull request #25076 from sfsmithcha/add_manage_nodes_guide
author merge: add swarm manage nodes guide
2016-07-26 11:33:46 -07:00
mapk0y
a94b48923e fix the ipaddress of an explanation.
Signed-off-by: mapk0y <mapk0y@gmail.com>
2016-07-27 03:17:32 +09:00
Anusha Ragunathan
42abccb841 Make daemon events listen for plugin lifecycle events.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-07-26 10:51:47 -07:00
Charles Smith
bef36fba40 add how services work to how swarm mode works guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-26 10:44:19 -07:00
Charles Smith
704facbbab add swarm manage nodes guide
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-26 10:25:05 -07:00
Vincent Demeester
4031d70d1b 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>
2016-07-25 18:57:02 -07:00
Tibor Vass
91e9f38313 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>
2016-07-25 14:28:45 -07:00
Alexandre Beslic
24f87f26e7 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>
2016-07-25 10:25:33 -07:00
Sebastiaan van Stijn
caedb3f827 Merge pull request #24207 from sfsmithcha/add_swarm_mode_guide
add run swarm mode guide
2016-07-25 19:21:01 +02:00