Merge pull request #417 from Mashimiao/add-version

add version file

Author: liangchenye

Makefile

@@ -4,15 +4,16 @@ BINDIR ?= $(DESTDIR)/usr/bin
 BUILDTAGS=
 RUNTIME ?= runc
 COMMIT=$(shell git rev-parse HEAD 2> /dev/null || true)
+VERSION := ${shell cat ./VERSION}
 
 all: tool runtimetest
 
 tool:
-	go build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT}" -o oci-runtime-tool ./cmd/oci-runtime-tool
+	go build -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -o oci-runtime-tool ./cmd/oci-runtime-tool
 
 .PHONY: runtimetest
 runtimetest:
-	CGO_ENABLED=0 go build -installsuffix cgo -tags "$(BUILDTAGS)" -o runtimetest ./cmd/runtimetest
+	CGO_ENABLED=0 go build -installsuffix cgo -tags "$(BUILDTAGS)" -ldflags "-X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -o runtimetest ./cmd/runtimetest
 
 .PHONY: man
 man:

VERSION

@@ -0,0 +1 @@
+0.3.0

cmd/oci-runtime-tool/main.go

@@ -12,13 +12,17 @@ import (
 // and will be populated by the Makefile
 var gitCommit = ""
 
+// version will be populated by the Makefile, read from
+// VERSION file of the source code.
+var version = ""
+
 func main() {
 	app := cli.NewApp()
 	app.Name = "oci-runtime-tool"
 	if gitCommit != "" {
-		app.Version = fmt.Sprintf("0.3.0, commit: %s", gitCommit)
+		app.Version = fmt.Sprintf("%s, commit: %s", version, gitCommit)
 	} else {
-		app.Version = "0.3.0"
+		app.Version = version
 	}
 	app.Usage = "OCI (Open Container Initiative) runtime tools"
 	app.Flags = []cli.Flag{

cmd/runtimetest/main.go

@@ -28,6 +28,14 @@ import (
 	"golang.org/x/sys/unix"
 )
 
+// gitCommit will be the hash that the binary was built from
+// and will be populated by the Makefile
+var gitCommit = ""
+
+// version will be populated by the Makefile, read from
+// VERSION file of the source code.
+var version = ""
+
 // PrGetNoNewPrivs isn't exposed in Golang so we define it ourselves copying the value from
 // the kernel
 const PrGetNoNewPrivs = 39
@@ -928,7 +936,11 @@ func run(context *cli.Context) error {
 func main() {
 	app := cli.NewApp()
 	app.Name = "runtimetest"
-	app.Version = "0.3.0"
+	if gitCommit != "" {
+		app.Version = fmt.Sprintf("%s, commit: %s", version, gitCommit)
+	} else {
+		app.Version = version
+	}
 	app.Usage = "Compare the environment with an OCI configuration"
 	app.Description = "runtimetest compares its current environment with an OCI runtime configuration read from config.json in its current working directory.  The tests are fairly generic and cover most configurations used by the runtime validation suite, but there are corner cases where a container launched by a valid runtime would not satisfy runtimetest."
 	app.Flags = []cli.Flag{