diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-31 06:48:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-31 06:48:12 -0700 |
| commit | 9c1985fc4ee0a30a5a852dfbeae742e64978ed25 (patch) | |
| tree | 4e8c06a177369b88206e24f27d964f10b4bbc531 /pkg | |
| parent | cf4288e3cc1cd95e512cae063066ca26917e378e (diff) | |
| parent | b2fef1a8badb875339d6329c095842baee4b3a17 (diff) | |
| download | podman-9c1985fc4ee0a30a5a852dfbeae742e64978ed25.tar.gz podman-9c1985fc4ee0a30a5a852dfbeae742e64978ed25.tar.bz2 podman-9c1985fc4ee0a30a5a852dfbeae742e64978ed25.zip | |
Merge pull request #1731 from afbjorklund/version
Fix setting of version information
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/varlinkapi/system.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go index 287f42209..a29d22e7d 100644 --- a/pkg/varlinkapi/system.go +++ b/pkg/varlinkapi/system.go @@ -34,6 +34,10 @@ func (i *LibpodAPI) Ping(call iopodman.VarlinkCall) error { // GetInfo returns details about the podman host and its stores func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error { + versionInfo, err := libpod.GetVersion() + if err != nil { + return err + } var ( registries, insecureRegistries []string ) @@ -64,11 +68,10 @@ func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error { podmanInfo.Host = infoHost store := info[1].Data pmaninfo := iopodman.InfoPodmanBinary{ - Compiler: goruntime.Compiler, - Go_version: goruntime.Version(), - // TODO : How are we going to get this here? - //Podman_version: - Git_commit: libpod.GitCommit, + Compiler: goruntime.Compiler, + Go_version: goruntime.Version(), + Podman_version: versionInfo.Version, + Git_commit: versionInfo.GitCommit, } graphStatus := iopodman.InfoGraphStatus{ |