beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #32731 from hairyhenderson/one-line-swarm-join-output-32725

Browse source 
Output `docker swarm join` command on a single line when running `docker swarm init`
This commit is contained in:
John Howard 2017-04-24 09:53:16 -05:00 committed by GitHub
commit c22b21fede
4 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/command/swarm/join_token.go
View file

@ -108,10 +108,10 @@ func printJoinCommand(ctx context.Context, dockerCli command.Cli, nodeID string,
if node.ManagerStatus != nil {
if worker {
fmt.Fprintf(dockerCli.Out(), "To add a worker to this swarm, run the following command:\n\n docker swarm join \\\n --token %s \\\n %s\n\n", sw.JoinTokens.Worker, node.ManagerStatus.Addr)
fmt.Fprintf(dockerCli.Out(), "To add a worker to this swarm, run the following command:\n\n docker swarm join --token %s %s\n\n", sw.JoinTokens.Worker, node.ManagerStatus.Addr)
}
if manager {
fmt.Fprintf(dockerCli.Out(), "To add a manager to this swarm, run the following command:\n\n docker swarm join \\\n --token %s \\\n %s\n\n", sw.JoinTokens.Manager, node.ManagerStatus.Addr)
fmt.Fprintf(dockerCli.Out(), "To add a manager to this swarm, run the following command:\n\n docker swarm join --token %s %s\n\n", sw.JoinTokens.Manager, node.ManagerStatus.Addr)
}
}

5
cli/command/swarm/testdata/jointoken-manager-rotate.golden vendored
View file

@ -2,7 +2,4 @@ Successfully rotated manager join token.
To add a manager to this swarm, run the following command:
docker swarm join \
--token manager-join-token \
127.0.0.1
docker swarm join --token manager-join-token 127.0.0.1

5
cli/command/swarm/testdata/jointoken-manager.golden vendored
View file

@ -1,6 +1,3 @@
To add a manager to this swarm, run the following command:
docker swarm join \
--token manager-join-token \
127.0.0.1
docker swarm join --token manager-join-token 127.0.0.1

5
cli/command/swarm/testdata/jointoken-worker.golden vendored
View file

@ -1,6 +1,3 @@
To add a worker to this swarm, run the following command:
docker swarm join \
--token worker-join-token \
127.0.0.1
docker swarm join --token worker-join-token 127.0.0.1