diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-21 13:23:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 13:23:20 +0000 |
| commit | 0a46b9c9e6aab2a5255914b285ae5b3cddb2aa5b (patch) | |
| tree | 41f8c9bb5802aff0b6482f67477a255308e7bc8b /pkg/bindings/system/system.go | |
| parent | 84c87fc7d3315ffcc44dde2469a613cb9b5c4190 (diff) | |
| parent | c4b49afad37b4e64a1aa2b90f4d3b04626fabd44 (diff) | |
| download | podman-0a46b9c9e6aab2a5255914b285ae5b3cddb2aa5b.tar.gz podman-0a46b9c9e6aab2a5255914b285ae5b3cddb2aa5b.tar.bz2 podman-0a46b9c9e6aab2a5255914b285ae5b3cddb2aa5b.zip | |
Merge pull request #7696 from jwhonce/wip/version
Refactor version handling in cmd tree
Diffstat (limited to 'pkg/bindings/system/system.go')
| -rw-r--r-- | pkg/bindings/system/system.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkg/bindings/system/system.go b/pkg/bindings/system/system.go index e995770ba..1203f5c3c 100644 --- a/pkg/bindings/system/system.go +++ b/pkg/bindings/system/system.go @@ -118,10 +118,10 @@ func Version(ctx context.Context) (*entities.SystemVersionReport, error) { if err = response.Process(&component); err != nil { return nil, err } - f, _ := strconv.ParseFloat(component.APIVersion, 64) + b, _ := time.Parse(time.RFC3339, component.BuildTime) report.Server = &define.Version{ - APIVersion: int64(f), + APIVersion: component.APIVersion, Version: component.Version.Version, GoVersion: component.GoVersion, GitCommit: component.GitCommit, @@ -129,6 +129,12 @@ func Version(ctx context.Context) (*entities.SystemVersionReport, error) { Built: b.Unix(), OsArch: fmt.Sprintf("%s/%s", component.Os, component.Arch), } + + for _, c := range component.Components { + if c.Name == "Podman Engine" { + report.Server.APIVersion = c.Details["APIVersion"] + } + } return &report, err } |