Add build information to

Author: garthy

Makefile

@@ -16,8 +16,10 @@ BIN := oci
 BUILD_DIR := dist
 BIN_DIR := ${BUILD_DIR}/bin
 
+BUILD := $(shell git describe --always --dirty)
 # Allow overriding for release versions
-VERSION ?= $(shell git describe --always --dirty)
+# Else just equal the build (git hash)
+VERSION ?= ${BUILD}
 GOOS ?= linux
 GOARCH ?= amd64
 
@@ -55,7 +57,7 @@ build:
 	    go build \
 	    -i \
 	    -v \
-	    -ldflags="-s -w -X main.version=${VERSION}" \
+	    -ldflags="-s -w -X main.version=${VERSION} -X main.build=${BUILD}" \
 	    -o ${BIN_DIR}/${BIN} ./cmd/oci/
 
 .PHONY: build-integration-tests

cmd/oci/main.go

@@ -23,8 +23,9 @@ import (
 	"github.com/oracle/oci-flexvolume-driver/pkg/oci/driver"
 )
 
-// version is set at build time to the version of the driver being built.
+// version/build is set at build time to the version of the driver being built.
 var version string
+var build string
 
 // GetLogPath returns the default path to the driver log file.
 func GetLogPath() string {
@@ -45,6 +46,6 @@ func main() {
 	defer f.Close()
 	log.SetOutput(f)
 
-	log.Printf("OCI FlexVolume Driver version: %s", version)
+	log.Printf("OCI FlexVolume Driver version: %s (%s)", version, build)
 	flexvolume.ExecDriver(&driver.OCIFlexvolumeDriver{}, os.Args)
 }