[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
| ... | ... |
@@ -81,13 +81,11 @@ func runInfo(dockerCli *client.DockerCli) error {
|
| 81 | 81 |
if info.Swarm.Error != "" {
|
| 82 | 82 |
fmt.Fprintf(dockerCli.Out(), " Error: %v\n", info.Swarm.Error) |
| 83 | 83 |
} |
| 84 |
+ fmt.Fprintf(dockerCli.Out(), " Is Manager: %v\n", info.Swarm.ControlAvailable) |
|
| 84 | 85 |
if info.Swarm.ControlAvailable {
|
| 85 |
- fmt.Fprintf(dockerCli.Out(), " IsManager: Yes\n") |
|
| 86 | 86 |
fmt.Fprintf(dockerCli.Out(), " Managers: %d\n", info.Swarm.Managers) |
| 87 | 87 |
fmt.Fprintf(dockerCli.Out(), " Nodes: %d\n", info.Swarm.Nodes) |
| 88 |
- ioutils.FprintfIfNotEmpty(dockerCli.Out(), " CACertHash: %s\n", info.Swarm.CACertHash) |
|
| 89 |
- } else {
|
|
| 90 |
- fmt.Fprintf(dockerCli.Out(), " IsManager: No\n") |
|
| 88 |
+ ioutils.FprintfIfNotEmpty(dockerCli.Out(), " CA Certificate Hash: %s\n", info.Swarm.CACertHash) |
|
| 91 | 89 |
} |
| 92 | 90 |
} |
| 93 | 91 |
|
| ... | ... |
@@ -57,10 +57,10 @@ node. For example, the tutorial uses a machine named `manager1`. |
| 57 | 57 |
...snip... |
| 58 | 58 |
Swarm: active |
| 59 | 59 |
NodeID: dxn1zf6l61qsb1josjja83ngz |
| 60 |
- IsManager: Yes |
|
| 60 |
+ Is Manager: true |
|
| 61 | 61 |
Managers: 1 |
| 62 | 62 |
Nodes: 1 |
| 63 |
- CACertHash: sha256:b7986d3baeff2f5664dfe350eec32e2383539ec1a802ba541c4eb829056b5f61 |
|
| 63 |
+ CA Certificate Hash: sha256:b7986d3baeff2f5664dfe350eec32e2383539ec1a802ba541c4eb829056b5f61 |
|
| 64 | 64 |
...snip... |
| 65 | 65 |
``` |
| 66 | 66 |
|