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

Merge pull request #25204 from yongtang/25195-docker-info-ca-configuration

Browse Source 
Output external CAs in swarm mode with `docker info`
Upstream-commit: 8f78dae4e308e47eb6cdba643c995a8a9b46b0cd
Component: engine
This commit is contained in:
Brian Goff
2016-08-01 21:34:00 -04:00
committed by GitHub
parent 9027f05cc9 a1efc2cd7a
commit c99b7360ea
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/api/client/system/info.go
+6
View File
@@ -98,6 +98,12 @@ func runInfo(dockerCli *client.DockerCli) error {
fmt.Fprintf(dockerCli.Out(), " Heartbeat Period: %s\n", units.HumanDuration(time.Duration(info.Swarm.Cluster.Spec.Dispatcher.HeartbeatPeriod)))
fmt.Fprintf(dockerCli.Out(), " CA Configuration:\n")
fmt.Fprintf(dockerCli.Out(), " Expiry Duration: %s\n", units.HumanDuration(info.Swarm.Cluster.Spec.CAConfig.NodeCertExpiry))
if len(info.Swarm.Cluster.Spec.CAConfig.ExternalCAs) > 0 {
fmt.Fprintf(dockerCli.Out(), " External CAs:\n")
for _, entry := range info.Swarm.Cluster.Spec.CAConfig.ExternalCAs {
fmt.Fprintf(dockerCli.Out(), " %s: %s\n", entry.Protocol, entry.URL)
}
}
}
fmt.Fprintf(dockerCli.Out(), " Node Address: %s\n", info.Swarm.NodeAddr)
}