diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-22 01:38:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-22 01:38:16 +0200 |
| commit | 99fcb90f28a041c85fee7e2550027fb91f996f4a (patch) | |
| tree | 6fe613171d3d42a3d01afd2571768e36bf7a7942 /pkg | |
| parent | b023d6d541f7feb16f64ee0ca1ac10e442d33241 (diff) | |
| parent | 7b188f7b5b28ea04bcda1747f1869a50ac4b6f4a (diff) | |
| download | podman-99fcb90f28a041c85fee7e2550027fb91f996f4a.tar.gz podman-99fcb90f28a041c85fee7e2550027fb91f996f4a.tar.bz2 podman-99fcb90f28a041c85fee7e2550027fb91f996f4a.zip | |
Merge pull request #6275 from rhatdan/VERSION
Display human build date in podman info
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/bindings/system/system.go | 12 | ||||
| -rw-r--r-- | pkg/varlinkapi/system.go | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkg/bindings/system/system.go b/pkg/bindings/system/system.go index e567e7a86..ed960b8e0 100644 --- a/pkg/bindings/system/system.go +++ b/pkg/bindings/system/system.go @@ -112,12 +112,12 @@ func Version(ctx context.Context) (*entities.SystemVersionReport, error) { f, _ := strconv.ParseFloat(component.APIVersion, 64) b, _ := time.Parse(time.RFC3339, component.BuildTime) report.Server = &define.Version{ - RemoteAPIVersion: int64(f), - Version: component.Version.Version, - GoVersion: component.GoVersion, - GitCommit: component.GitCommit, - Built: b.Unix(), - OsArch: fmt.Sprintf("%s/%s", component.Os, component.Arch), + APIVersion: int64(f), + Version: component.Version.Version, + GoVersion: component.GoVersion, + GitCommit: component.GitCommit, + Built: b.Unix(), + OsArch: fmt.Sprintf("%s/%s", component.Os, component.Arch), } return &report, err } diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go index 82efe9b5d..308f02274 100644 --- a/pkg/varlinkapi/system.go +++ b/pkg/varlinkapi/system.go @@ -28,7 +28,7 @@ func (i *VarlinkAPI) GetVersion(call iopodman.VarlinkCall) error { versionInfo.GitCommit, time.Unix(versionInfo.Built, 0).Format(time.RFC3339), versionInfo.OsArch, - versionInfo.RemoteAPIVersion, + versionInfo.APIVersion, ) } |