Set PkgVersion at rpmbuild time. Default: "<unknown>"

Signed-off-by: Antonio Murdaca <runcom@redhat.com>

Author: runcom

cli/command/system/version.go

@@ -11,7 +11,6 @@ import (
 	"github.com/docker/docker/cli"
 	"github.com/docker/docker/cli/command"
 	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/pkg/rpm"
 	"github.com/docker/docker/utils/templates"
 	"github.com/spf13/cobra"
 )
@@ -72,7 +71,6 @@ func runVersion(dockerCli *command.DockerCli, opts *versionOptions) error {
 		return cli.StatusError{StatusCode: 64,
 			Status: "Template parsing error: " + err.Error()}
 	}
-	packageVersion, _ := rpm.Version("/usr/bin/docker")
 
 	APIVersion := dockerCli.Client().ClientVersion()
 	if defaultAPIVersion := dockerCli.DefaultVersion(); APIVersion != defaultAPIVersion {
@@ -83,7 +81,7 @@ func runVersion(dockerCli *command.DockerCli, opts *versionOptions) error {
 		Client: &types.Version{
 			Version:    dockerversion.Version,
 			APIVersion: APIVersion,
-			PkgVersion: packageVersion,
+			PkgVersion: "<unknown>",
 			GoVersion:  runtime.Version(),
 			GitCommit:  dockerversion.GitCommit,
 			BuildTime:  dockerversion.BuildTime,

daemon/info.go

@@ -3,7 +3,6 @@ package daemon
 import (
 	"fmt"
 	"os"
-	"os/exec"
 	"runtime"
 	"sync/atomic"
 	"time"
@@ -17,7 +16,6 @@ import (
 	"github.com/docker/docker/pkg/parsers/kernel"
 	"github.com/docker/docker/pkg/parsers/operatingsystem"
 	"github.com/docker/docker/pkg/platform"
-	"github.com/docker/docker/pkg/rpm"
 	"github.com/docker/docker/pkg/sysinfo"
 	"github.com/docker/docker/pkg/system"
 	"github.com/docker/docker/registry"
@@ -59,14 +57,6 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
 	}
 
 	sysInfo := sysinfo.New(true)
-	dockerPath, err := exec.LookPath("docker")
-	if err != nil {
-		logrus.Warnf("could not look docker binary path: %v", err)
-	}
-	packageVersion, err := rpm.Version(dockerPath)
-	if err != nil {
-		logrus.Warnf("could not retrieve docker rpm version: %v", err)
-	}
 
 	var cRunning, cPaused, cStopped int32
 	daemon.containers.ApplyAll(func(c *container.Container) {
@@ -149,7 +139,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
 		LiveRestoreEnabled: daemon.configStore.LiveRestoreEnabled,
 		SecurityOptions:    securityOptions,
 		Isolation:          daemon.defaultIsolation,
-		PkgVersion:         packageVersion,
+		PkgVersion:         "<unknown>",
 		Registries:         registries,
 	}
 
@@ -169,7 +159,6 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
 
 // SystemVersion returns version information about the daemon.
 func (daemon *Daemon) SystemVersion() types.Version {
-	pkgVersion, _ := rpm.Version("/usr/bin/docker")
 	v := types.Version{
 		Version:       dockerversion.Version,
 		GitCommit:     dockerversion.GitCommit,
@@ -179,7 +168,7 @@ func (daemon *Daemon) SystemVersion() types.Version {
 		Arch:          runtime.GOARCH,
 		BuildTime:     dockerversion.BuildTime,
 		Experimental:  daemon.configStore.Experimental,
-		PkgVersion:    pkgVersion,
+		PkgVersion:    "<unknown>",
 	}
 
 	kernelVersion := "<unknown>"