mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
improve version
This commit is contained in:
parent
f6653c3fa5
commit
646afab28d
1 changed files with 9 additions and 3 deletions
12
commands.go
12
commands.go
|
@ -19,6 +19,7 @@ import (
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"reflect"
|
"reflect"
|
||||||
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"syscall"
|
"syscall"
|
||||||
|
@ -433,6 +434,12 @@ func (cli *DockerCli) CmdVersion(args ...string) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fmt.Fprintf(cli.out, "Client version: %s\n", VERSION)
|
||||||
|
fmt.Fprintf(cli.out, "Go version (client): %s\n", runtime.Version())
|
||||||
|
if GITCOMMIT != "" {
|
||||||
|
fmt.Fprintf(cli.out, "Git commit (client): %s\n", GITCOMMIT)
|
||||||
|
}
|
||||||
|
|
||||||
body, _, err := cli.call("GET", "/version", nil)
|
body, _, err := cli.call("GET", "/version", nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -444,13 +451,12 @@ func (cli *DockerCli) CmdVersion(args ...string) error {
|
||||||
utils.Debugf("Error unmarshal: body: %s, err: %s\n", body, err)
|
utils.Debugf("Error unmarshal: body: %s, err: %s\n", body, err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
fmt.Fprintf(cli.out, "Client version: %s\n", VERSION)
|
|
||||||
fmt.Fprintf(cli.out, "Server version: %s\n", out.Version)
|
fmt.Fprintf(cli.out, "Server version: %s\n", out.Version)
|
||||||
if out.GitCommit != "" {
|
if out.GitCommit != "" {
|
||||||
fmt.Fprintf(cli.out, "Git commit: %s\n", out.GitCommit)
|
fmt.Fprintf(cli.out, "Git commit (version): %s\n", out.GitCommit)
|
||||||
}
|
}
|
||||||
if out.GoVersion != "" {
|
if out.GoVersion != "" {
|
||||||
fmt.Fprintf(cli.out, "Go version: %s\n", out.GoVersion)
|
fmt.Fprintf(cli.out, "Go version (server): %s\n", out.GoVersion)
|
||||||
}
|
}
|
||||||
|
|
||||||
release := utils.GetReleaseVersion()
|
release := utils.GetReleaseVersion()
|
||||||
|
|
Loading…
Reference in a new issue