1. docker
  2. Commit bfff4cce676f12fb092e82b61cc626dfa3944405
Browse code

Merge pull request #23696 from sfsmithcha/check_swarm_cli

update docker swarm cli

Vincent Demeester authored on 2016/06/20 22:40:06
Showing 4 changed files
docs/reference/commandline/swarm_init.md
History View file @ bfff4cc
... ... 
@@ -28,17 +28,17 @@ in the newly created one node Swarm cluster.
28 28
29 29 
 ```bash
30 30 
 $ docker swarm init --listen-addr 192.168.99.121:2377
31 
-Initializing a new swarm
31 
+Swarm initialized: current node (1ujecd0j9n3ro9i6628smdmth) is now a manager.
32 32 
 $ docker node ls
33 
-ID              NAME          STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
34 
-3l1f6uzcuoa3 *  swarm-master  READY   ACTIVE                   REACHABLE       Yes
33 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS          LEADER
34 
+1ujecd0j9n3ro9i6628smdmth *  manager1  Accepted    Ready   Active        Reachable               Yes
35 35 
 ```
36 36
37 37 
 ###	--auto-accept value
38 38
39 39 
 This flag controls node acceptance into the cluster. By default, both `worker` and `manager`
40 40 
 nodes are auto accepted by the cluster. This can be changed by specifing what kinds of nodes
41 
-can be auto-accepted into the cluster. If auto-accept is not turned on, then
41 
+can be auto-accepted into the cluster. If auto-accept is not turned on, then
42 42 
 [node accept](node_accept.md) can be used to explicitly accept a node into the cluster.
43 43
44 44 
 For example, the following initializes a cluster with auto-acceptance of workers, but not managers
... ... 
@@ -46,7 +46,7 @@ For example, the following initializes a cluster with auto-acceptance of workers
46 46
47 47 
 ```bash
48 48 
 $ docker swarm init --listen-addr 192.168.99.121:2377 --auto-accept worker
49 
-Initializing a new swarm
49 
+Swarm initialized: current node (1m8cdsylxbf3lk8qriqt07hx1) is now a manager.
50 50 
 ```
51 51
52 52 
 ### `--force-new-cluster`
docs/reference/commandline/swarm_join.md
History View file @ bfff4cc
... ... 
@@ -28,23 +28,23 @@ targeted by this command becomes a `manager`. If it is not specified, it becomes
28 28
29 29 
 ```bash
30 30 
 $ docker swarm join --manager --listen-addr 192.168.99.122:2377 192.168.99.121:2377
31 
-This node is attempting to join a Swarm as a manager.
31 
+This node joined a Swarm as a manager.
32 32 
 $ docker node ls
33 
-ID              NAME           STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
34 
-2fg70txcrde2    swarm-node-01  READY   ACTIVE                   REACHABLE
35 
-3l1f6uzcuoa3 *  swarm-master   READY   ACTIVE                   REACHABLE       Yes
33 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS         LEADER
34 
+dkp8vy1dq1kxleu9g4u78tlag *  manager2  Accepted    Ready   Active        Reachable
35 
+dvfxp4zseq4s0rih1selh0d20    manager1  Accepted    Ready   Active        Reachable              Yes
36 36 
 ```
37 37
38 38 
 ### Join a node to swarm as a worker
39 39
40 40 
 ```bash
41 41 
 $ docker swarm join --listen-addr 192.168.99.123:2377 192.168.99.121:2377
42 
-This node is attempting to join a Swarm.
42 
+This node joined a Swarm as a worker.
43 43 
 $ docker node ls
44 
-ID              NAME           STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
45 
-04zm7ue1fd1q    swarm-node-02  READY   ACTIVE
46 
-2fg70txcrde2    swarm-node-01  READY   ACTIVE                   REACHABLE
47 
-3l1f6uzcuoa3 *  swarm-master   READY   ACTIVE                   REACHABLE       Yes
44 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS         LEADER
45 
+7ln70fl22uw2dvjn2ft53m3q5    worker2   Accepted    Ready   Active
46 
+dkp8vy1dq1kxleu9g4u78tlag    worker1   Accepted    Ready   Active        Reachable
47 
+dvfxp4zseq4s0rih1selh0d20 *  manager1  Accepted    Ready   Active        Reachable              Yes
48 48 
 ```
49 49
50 50 
 ### `--manager`
docs/reference/commandline/swarm_leave.md
History View file @ bfff4cc
... ... 
@@ -23,10 +23,10 @@ This command causes the node to leave the swarm.
23 23 
 On a manager node:
24 24 
 ```bash
25 25 
 $ docker node ls
26 
-ID              NAME           STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
27 
-04zm7ue1fd1q    swarm-node-02  READY   ACTIVE
28 
-2fg70txcrde2    swarm-node-01  READY   ACTIVE                   REACHABLE
29 
-3l1f6uzcuoa3 *  swarm-master   READY   ACTIVE                   REACHABLE       Yes
26 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS         LEADER
27 
+7ln70fl22uw2dvjn2ft53m3q5    worker2   Accepted    Ready   Active
28 
+dkp8vy1dq1kxleu9g4u78tlag    worker1   Accepted    Ready   Active        Reachable
29 
+dvfxp4zseq4s0rih1selh0d20 *  manager1  Accepted    Ready   Active        Reachable              Yes
30 30 
 ```
31 31
32 32 
 On a worker node:
... ... 
@@ -38,10 +38,10 @@ Node left the default swarm.
38 38 
 On a manager node:
39 39 
 ```bash
40 40 
 $ docker node ls
41 
-ID              NAME           STATUS  AVAILABILITY/MEMBERSHIP  MANAGER STATUS  LEADER
42 
-04zm7ue1fd1q    swarm-node-02  DOWN    ACTIVE
43 
-2fg70txcrde2    swarm-node-01  READY   ACTIVE                   REACHABLE
44 
-3l1f6uzcuoa3 *  swarm-master   READY   ACTIVE                   REACHABLE       Yes
41 
+ID                           NAME      MEMBERSHIP  STATUS  AVAILABILITY  MANAGER STATUS         LEADER
42 
+7ln70fl22uw2dvjn2ft53m3q5    worker2   Accepted    Down    Active
43 
+dkp8vy1dq1kxleu9g4u78tlag    worker1   Accepted    Ready   Active        Reachable
44 
+dvfxp4zseq4s0rih1selh0d20 *  manager1  Accepted    Ready   Active        Reachable              Yes
45 45 
 ```
46 46
47 47 
 ## Related information
docs/reference/commandline/swarm_update.md
History View file @ bfff4cc
... ... 
@@ -12,16 +12,15 @@ parent = "smn_cli"
12 12 
 # swarm update
13 13
14 14 
     Usage:  docker swarm update [OPTIONS]
15 
-
15 
+
16 16 
     update the Swarm.
17 
-
17 
+
18 18 
     Options:
19 19 
           --auto-accept value               Auto acceptance policy (worker, manager or none)
20 20 
           --dispatcher-heartbeat duration   Dispatcher heartbeat period (default 5s)
21 21 
           --help                            Print usage
22 22 
           --secret string                   Set secret value needed to accept nodes into cluster
23 23 
           --task-history-limit int          Task history retention limit (default 10)
24 
-          --cert-expiry duration            Validity period for node certificates (default 2160h0m0s)
25 24
26 25 
 Updates a Swarm cluster with new parameter values. This command must target a manager node.
27 26
... ... 
@@ -35,4 +34,3 @@ $ docker swarm update --auto-accept manager
35 35 
 * [swarm init](swarm_init.md)
36 36 
 * [swarm join](swarm_join.md)
37 37 
 * [swarm leave](swarm_leave.md)
38 
-