diff --git a/cli/command/cli.go b/cli/command/cli.go index 2f3d4ab240..8b5780d6b7 100644 --- a/cli/command/cli.go +++ b/cli/command/cli.go @@ -88,7 +88,7 @@ type DockerCli struct { enableGlobalMeter, enableGlobalTracer bool } -// DefaultVersion returns api.defaultVersion. +// DefaultVersion returns [api.DefaultVersion]. func (*DockerCli) DefaultVersion() string { return api.DefaultVersion } diff --git a/cli/command/system/version.go b/cli/command/system/version.go index 0e0422bd40..f84569767d 100644 --- a/cli/command/system/version.go +++ b/cli/command/system/version.go @@ -16,6 +16,7 @@ import ( flagsHelper "github.com/docker/cli/cli/flags" "github.com/docker/cli/cli/version" "github.com/docker/cli/templates" + "github.com/docker/docker/api" "github.com/docker/docker/api/types" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -89,20 +90,20 @@ type clientVersion struct { // information. func newClientVersion(contextName string, dockerCli command.Cli) clientVersion { v := clientVersion{ - Version: version.Version, - GoVersion: runtime.Version(), - GitCommit: version.GitCommit, - BuildTime: reformatDate(version.BuildTime), - Os: runtime.GOOS, - Arch: arch(), - Context: contextName, + Version: version.Version, + DefaultAPIVersion: api.DefaultVersion, + GoVersion: runtime.Version(), + GitCommit: version.GitCommit, + BuildTime: reformatDate(version.BuildTime), + Os: runtime.GOOS, + Arch: arch(), + Context: contextName, } if version.PlatformName != "" { v.Platform = &platformInfo{Name: version.PlatformName} } if dockerCli != nil { v.APIVersion = dockerCli.CurrentVersion() - v.DefaultAPIVersion = dockerCli.DefaultVersion() } return v } diff --git a/internal/test/cli.go b/internal/test/cli.go index 35e4a317a5..8b506e1414 100644 --- a/internal/test/cli.go +++ b/internal/test/cli.go @@ -14,6 +14,7 @@ import ( registryclient "github.com/docker/cli/cli/registry/client" "github.com/docker/cli/cli/streams" "github.com/docker/cli/cli/trust" + "github.com/docker/docker/api" "github.com/docker/docker/client" notaryclient "github.com/theupdateframework/notary/client" ) @@ -104,8 +105,8 @@ func (c *FakeCli) Client() client.APIClient { } // CurrentVersion returns the API version used by FakeCli. -func (c *FakeCli) CurrentVersion() string { - return c.DefaultVersion() +func (*FakeCli) CurrentVersion() string { + return api.DefaultVersion } // Out returns the output stream (stdout) the cli should write on