opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +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

3
Makefile
View File

@ -36,7 +36,8 @@ PACKAGES ?= $(shell $(GO) list -tags "${BUILDTAGS}" ./... | grep -v github.com/c
COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true) COMMIT_NO ?= $(shell git rev-parse HEAD 2> /dev/null || true)
GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}") GIT_COMMIT ?= $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
BUILD_INFO ?= $(shell date +%s) BUILD_INFO ?= $(shell date +%s)
LDFLAGS_PODMAN ?= $(LDFLAGS) -X main.gitCommit=$(GIT_COMMIT) -X main.buildInfo=$(BUILD_INFO) LIBPOD := ${PROJECT}/libpod
LDFLAGS_PODMAN ?= $(LDFLAGS) -X $(LIBPOD).gitCommit=$(GIT_COMMIT) -X $(LIBPOD).buildInfo=$(BUILD_INFO)
ISODATE ?= $(shell date --iso-8601) ISODATE ?= $(shell date --iso-8601)
LIBSECCOMP_COMMIT := release-2.3 LIBSECCOMP_COMMIT := release-2.3

3
cmd/podman/info.go
View File

@ -81,6 +81,7 @@ func debugInfo(c *cli.Context) map[string]interface{} {
info["compiler"] = runtime.Compiler info["compiler"] = runtime.Compiler
info["go version"] = runtime.Version() info["go version"] = runtime.Version()
info["podman version"] = c.App.Version info["podman version"] = c.App.Version
info["git commit"] = libpod.GitCommit version, _ := libpod.GetVersion()
info["git commit"] = version.GitCommit
return info return info
} }

2
cmd/podman/version.go
View File

@ -21,7 +21,7 @@ func versionCmd(c *cli.Context) error {
fmt.Println("Git Commit: ", output.GitCommit) fmt.Println("Git Commit: ", output.GitCommit)
} }
// Prints out the build time in readable format // Prints out the build time in readable format
if libpod.BuildInfo != "" { if output.Built != 0 {
fmt.Println("Built: ", time.Unix(output.Built, 0).Format(time.ANSIC)) fmt.Println("Built: ", time.Unix(output.Built, 0).Format(time.ANSIC))
} }

10
libpod/version.go
View File

@ -11,10 +11,10 @@ import (
var ( var (
// GitCommit is the commit that the binary is being built from. // GitCommit is the commit that the binary is being built from.
// It will be populated by the Makefile. // It will be populated by the Makefile.
GitCommit string gitCommit string
// BuildInfo is the time at which the binary was built // BuildInfo is the time at which the binary was built
// It will be populated by the Makefile. // It will be populated by the Makefile.
BuildInfo string buildInfo string
) )
//Version is an output struct for varlink //Version is an output struct for varlink
@ -30,9 +30,9 @@ type Version struct {
func GetVersion() (Version, error) { func GetVersion() (Version, error) {
var err error var err error
var buildTime int64 var buildTime int64
if BuildInfo != "" { if buildInfo != "" {
// Converts unix time from string to int64 // Converts unix time from string to int64
buildTime, err = strconv.ParseInt(BuildInfo, 10, 64) buildTime, err = strconv.ParseInt(buildInfo, 10, 64)
if err != nil { if err != nil {
return Version{}, err return Version{}, err
@ -41,7 +41,7 @@ func GetVersion() (Version, error) {
return Version{ return Version{
Version: podmanVersion.Version, Version: podmanVersion.Version,
GoVersion: runtime.Version(), GoVersion: runtime.Version(),
GitCommit: GitCommit, GitCommit: gitCommit,
Built: buildTime, Built: buildTime,
OsArch: runtime.GOOS + "/" + runtime.GOARCH, OsArch: runtime.GOOS + "/" + runtime.GOARCH,
}, nil }, nil

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 // GetInfo returns details about the podman host and its stores
func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error { func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error {
versionInfo, err := libpod.GetVersion()
if err != nil {
return err
}
var ( var (
registries, insecureRegistries []string registries, insecureRegistries []string
) )
@ -64,11 +68,10 @@ func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error {
podmanInfo.Host = infoHost podmanInfo.Host = infoHost
store := info[1].Data store := info[1].Data
pmaninfo := iopodman.InfoPodmanBinary{ pmaninfo := iopodman.InfoPodmanBinary{
Compiler: goruntime.Compiler, Compiler: goruntime.Compiler,
Go_version: goruntime.Version(), Go_version: goruntime.Version(),
// TODO : How are we going to get this here? Podman_version: versionInfo.Version,
//Podman_version: Git_commit: versionInfo.GitCommit,
Git_commit: libpod.GitCommit,
} }
graphStatus := iopodman.InfoGraphStatus{ graphStatus := iopodman.InfoGraphStatus{