q3k
/
docker-cli-openbsd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change NAME to HOSTNAME in docs for `docker node ls` 

In #24159, the title field of `docker node ls` has been
changed from NAME to HOSTNAME. However, in the docs the
NAMEs are still used for the output of `docker node ls`.

This fix updates docs so that NAME field is changed to
HOSTNAME for all `docker node ls`.

This fix is related to #24159 and #24090.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
master
Yong Tang 2016-07-06 20:23:53 -07:00 committed by Tibor Vass
parent 06683c5ea3
commit cab7139a4b
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/reference/commandline/node_ls.md
View File

@ -28,7 +28,7 @@ Lists all the nodes that the Docker Swarm manager knows about. You can filter us
Example output: Example output:
$ docker node ls $ docker node ls
ID NAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER ID HOSTNAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER
1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Accepted Ready Active 1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Accepted Ready Active
38ciaotwjuritcdtn9npbnkuz swarm-worker1 Accepted Ready Active 38ciaotwjuritcdtn9npbnkuz swarm-worker1 Accepted Ready Active
e216jshn25ckzbvmwlnh5jr3g * swarm-manager1 Accepted Ready Active Reachable Yes e216jshn25ckzbvmwlnh5jr3g * swarm-manager1 Accepted Ready Active Reachable Yes
@ -52,7 +52,7 @@ The `name` filter matches on all or part of a node name.
The following filter matches the node with a name equal to `swarm-master` string. The following filter matches the node with a name equal to `swarm-master` string.
$ docker node ls -f name=swarm-manager1 $ docker node ls -f name=swarm-manager1
ID NAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER ID HOSTNAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER
e216jshn25ckzbvmwlnh5jr3g * swarm-manager1 Accepted Ready Active Reachable Yes e216jshn25ckzbvmwlnh5jr3g * swarm-manager1 Accepted Ready Active Reachable Yes
### id ### id
@ -60,7 +60,7 @@ The following filter matches the node with a name equal to `swarm-master` string
The `id` filter matches all or part of a node's id. The `id` filter matches all or part of a node's id.
$ docker node ls -f id=1 $ docker node ls -f id=1
ID NAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER ID HOSTNAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER
1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Accepted Ready Active 1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Accepted Ready Active
@ -73,7 +73,7 @@ The following filter matches nodes with the `usage` label regardless of its valu
```bash ```bash
$ docker node ls -f "label=foo" $ docker node ls -f "label=foo"
ID NAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER ID HOSTNAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER
1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Accepted Ready Active 1bcef6utixb0l0ca7gxuivsj0 swarm-worker2 Accepted Ready Active
``` ```

2
docs/reference/commandline/swarm_init.md
View File

@ -31,7 +31,7 @@ in the newly created one node Swarm cluster.
$ docker swarm init --listen-addr 192.168.99.121:2377 $ docker swarm init --listen-addr 192.168.99.121:2377
Swarm initialized: current node (1ujecd0j9n3ro9i6628smdmth) is now a manager. Swarm initialized: current node (1ujecd0j9n3ro9i6628smdmth) is now a manager.
$ docker node ls $ docker node ls
ID NAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER ID HOSTNAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER
1ujecd0j9n3ro9i6628smdmth * manager1 Accepted Ready Active Reachable Yes 1ujecd0j9n3ro9i6628smdmth * manager1 Accepted Ready Active Reachable Yes
``` ```

4
docs/reference/commandline/swarm_join.md
View File

@ -30,7 +30,7 @@ targeted by this command becomes a `manager`. If it is not specified, it becomes
$ docker swarm join --manager --listen-addr 192.168.99.122:2377 192.168.99.121:2377 $ docker swarm join --manager --listen-addr 192.168.99.122:2377 192.168.99.121:2377
This node joined a Swarm as a manager. This node joined a Swarm as a manager.
$ docker node ls $ docker node ls
ID NAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER ID HOSTNAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER
dkp8vy1dq1kxleu9g4u78tlag * manager2 Accepted Ready Active Reachable dkp8vy1dq1kxleu9g4u78tlag * manager2 Accepted Ready Active Reachable
dvfxp4zseq4s0rih1selh0d20 manager1 Accepted Ready Active Reachable Yes dvfxp4zseq4s0rih1selh0d20 manager1 Accepted Ready Active Reachable Yes
``` ```
@ -41,7 +41,7 @@ dvfxp4zseq4s0rih1selh0d20 manager1 Accepted Ready Active Reachab
$ docker swarm join --listen-addr 192.168.99.123:2377 192.168.99.121:2377 $ docker swarm join --listen-addr 192.168.99.123:2377 192.168.99.121:2377
This node joined a Swarm as a worker. This node joined a Swarm as a worker.
$ docker node ls $ docker node ls
ID NAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER ID HOSTNAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER
7ln70fl22uw2dvjn2ft53m3q5 worker2 Accepted Ready Active 7ln70fl22uw2dvjn2ft53m3q5 worker2 Accepted Ready Active
dkp8vy1dq1kxleu9g4u78tlag worker1 Accepted Ready Active Reachable dkp8vy1dq1kxleu9g4u78tlag worker1 Accepted Ready Active Reachable
dvfxp4zseq4s0rih1selh0d20 * manager1 Accepted Ready Active Reachable Yes dvfxp4zseq4s0rih1selh0d20 * manager1 Accepted Ready Active Reachable Yes

4
docs/reference/commandline/swarm_leave.md
View File

@ -23,7 +23,7 @@ This command causes the node to leave the swarm.
On a manager node: On a manager node:
```bash ```bash
$ docker node ls $ docker node ls
ID NAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER ID HOSTNAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER
7ln70fl22uw2dvjn2ft53m3q5 worker2 Accepted Ready Active 7ln70fl22uw2dvjn2ft53m3q5 worker2 Accepted Ready Active
dkp8vy1dq1kxleu9g4u78tlag worker1 Accepted Ready Active Reachable dkp8vy1dq1kxleu9g4u78tlag worker1 Accepted Ready Active Reachable
dvfxp4zseq4s0rih1selh0d20 * manager1 Accepted Ready Active Reachable Yes dvfxp4zseq4s0rih1selh0d20 * manager1 Accepted Ready Active Reachable Yes
@ -38,7 +38,7 @@ Node left the default swarm.
On a manager node: On a manager node:
```bash ```bash
$ docker node ls $ docker node ls
ID NAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER ID HOSTNAME MEMBERSHIP STATUS AVAILABILITY MANAGER STATUS LEADER
7ln70fl22uw2dvjn2ft53m3q5 worker2 Accepted Down Active 7ln70fl22uw2dvjn2ft53m3q5 worker2 Accepted Down Active
dkp8vy1dq1kxleu9g4u78tlag worker1 Accepted Ready Active Reachable dkp8vy1dq1kxleu9g4u78tlag worker1 Accepted Ready Active Reachable
dvfxp4zseq4s0rih1selh0d20 * manager1 Accepted Ready Active Reachable Yes dvfxp4zseq4s0rih1selh0d20 * manager1 Accepted Ready Active Reachable Yes