From 7c74809fe9bcba68f44f78f5ec14a1de9ee24861 Mon Sep 17 00:00:00 2001 From: John Howard Date: Wed, 23 Nov 2016 13:42:50 -0800 Subject: [PATCH] Align output of docker version again Signed-off-by: John Howard (cherry picked from commit dfeaf7a959cf619f5460c88e7bc1fe5ce40d50a7) Signed-off-by: Victor Vieux --- cli/command/system/version.go | 15 +++++++-------- integration-cli/docker_cli_version_test.go | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cli/command/system/version.go b/cli/command/system/version.go index 00a84a3cbc..ded4f4d118 100644 --- a/cli/command/system/version.go +++ b/cli/command/system/version.go @@ -24,14 +24,13 @@ var versionTemplate = `Client: OS/Arch: {{.Client.Os}}/{{.Client.Arch}}{{if .ServerOK}} Server: - Version: {{.Server.Version}} - API version: {{.Server.APIVersion}} - Minimum API version: {{.Server.MinAPIVersion}} - Go version: {{.Server.GoVersion}} - Git commit: {{.Server.GitCommit}} - Built: {{.Server.BuildTime}} - OS/Arch: {{.Server.Os}}/{{.Server.Arch}} - Experimental: {{.Server.Experimental}}{{end}}` + Version: {{.Server.Version}} + API version: {{.Server.APIVersion}} (minimum version {{.Server.MinAPIVersion}}) + Go version: {{.Server.GoVersion}} + Git commit: {{.Server.GitCommit}} + Built: {{.Server.BuildTime}} + OS/Arch: {{.Server.Os}}/{{.Server.Arch}} + Experimental: {{.Server.Experimental}}{{end}}` type versionOptions struct { format string diff --git a/integration-cli/docker_cli_version_test.go b/integration-cli/docker_cli_version_test.go index 40b8d0e726..7672beb732 100644 --- a/integration-cli/docker_cli_version_test.go +++ b/integration-cli/docker_cli_version_test.go @@ -14,7 +14,7 @@ func (s *DockerSuite) TestVersionEnsureSucceeds(c *check.C) { "Client:": 1, "Server:": 1, " Version:": 2, - " API version:": 3, + " API version:": 2, " Go version:": 2, " Git commit:": 2, " OS/Arch:": 2, @@ -40,7 +40,7 @@ func (s *DockerSuite) TestVersionPlatform_l(c *check.C) { func testVersionPlatform(c *check.C, platform string) { out, _ := dockerCmd(c, "version") - expected := "OS/Arch: " + platform + expected := "OS/Arch: " + platform split := strings.Split(out, "\n") c.Assert(len(split) >= 14, checker.Equals, true, check.Commentf("got %d lines from version", len(split)))