diff --git a/cli/command/system/info.go b/cli/command/system/info.go index a3669802b835..0bb611bcc108 100644 --- a/cli/command/system/info.go +++ b/cli/command/system/info.go @@ -101,11 +101,14 @@ func runInfo(ctx context.Context, cmd *cobra.Command, dockerCli command.Cli, opt var serverConnErr error if needsServerInfo(opts.format, info) { serverConnErr = addServerInfo(ctx, dockerCli, opts.format, &info) + if serverConnErr == nil { + // Update client API version after it was negotiated. + info.ClientInfo.APIVersion = dockerCli.CurrentVersion() + } } if opts.format == "" { info.UserName = dockerCli.ConfigFile().AuthConfigs[registry.IndexServer].Username - info.ClientInfo.APIVersion = dockerCli.CurrentVersion() return errors.Join(prettyPrintInfo(dockerCli, info), serverConnErr) } diff --git a/cli/command/system/version.go b/cli/command/system/version.go index 3a0ad75c351e..e2e796c3b115 100644 --- a/cli/command/system/version.go +++ b/cli/command/system/version.go @@ -91,6 +91,7 @@ type clientVersion struct { func newClientVersion(contextName string, dockerCli command.Cli) clientVersion { v := clientVersion{ Version: version.Version, + APIVersion: api.DefaultVersion, DefaultAPIVersion: api.DefaultVersion, GoVersion: runtime.Version(), GitCommit: version.GitCommit,