opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 02:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1731 from afbjorklund/version

Browse Source 
Fix setting of version information
This commit is contained in:
OpenShift Merge Robot
2018-10-31 06:48:12 -07:00
committed by GitHub
parent cf4288e3cc b2fef1a8ba
commit 9c1985fc4e
5 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/varlinkapi/system.go
View File

@ -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{