diff --git a/Makefile b/Makefile index 1aed913f86..351e76f888 100755 --- a/Makefile +++ b/Makefile @@ -86,6 +86,9 @@ SOURCE_PACKAGES = ./cmd/... ./pkg/... ./test/... # kvm2 ldflags KVM2_LDFLAGS := -X k8s.io/minikube/pkg/drivers/kvm.version=$(VERSION) -X k8s.io/minikube/pkg/drivers/kvm.gitCommitID=$(COMMIT) +# hyperkit ldflags +HYPERKIT_LDFLAGS := -X k8s.io/minikube/pkg/drivers/hyperkit.version=$(VERSION) -X k8s.io/minikube/pkg/drivers/hyperkit.gitCommitID=$(COMMIT) + # $(call DOCKER, image, command) define DOCKER docker run --rm -e GOCACHE=/app/.cache -e IN_DOCKER=1 --user $(shell id -u):$(shell id -g) -w /app -v $(PWD):/app -v $(GOPATH):/go --entrypoint /bin/bash $(1) -c '$(2)' @@ -330,7 +333,7 @@ ifeq ($(MINIKUBE_BUILD_IN_DOCKER),y) $(call DOCKER,$(HYPERKIT_BUILD_IMAGE),CC=o64-clang CXX=o64-clang++ /usr/bin/make $@) else GOOS=darwin CGO_ENABLED=1 go build \ - -ldflags "-X k8s.io/minikube/pkg/drivers/hyperkit.version=$(VERSION)" \ + -ldflags="$(HYPERKIT_LDFLAGS)" \ -o $(BUILD_DIR)/docker-machine-driver-hyperkit k8s.io/minikube/cmd/drivers/hyperkit endif diff --git a/cmd/drivers/hyperkit/main.go b/cmd/drivers/hyperkit/main.go index c5b35ed6f8..32788b0c2b 100644 --- a/cmd/drivers/hyperkit/main.go +++ b/cmd/drivers/hyperkit/main.go @@ -27,8 +27,9 @@ import ( ) func main() { - if len(os.Args) > 1 && os.Args[1] == "--version" { - fmt.Println(hyperkit.GetVersion()) + if len(os.Args) > 1 && os.Args[1] == "version" { + fmt.Println("version:", hyperkit.GetVersion()) + fmt.Println("commit:", hyperkit.GetGitCommitID()) return } diff --git a/pkg/drivers/hyperkit/version.go b/pkg/drivers/hyperkit/version.go index d72959a8a5..249da2fdc5 100644 --- a/pkg/drivers/hyperkit/version.go +++ b/pkg/drivers/hyperkit/version.go @@ -21,7 +21,15 @@ package hyperkit // version is a private field and should be set when compiling with --ldflags="-X k8s.io/minikube/pkg/drivers/hyperkit.version=vX.Y.Z" var version = "v0.0.0-unset" +// gitCommitID is a private field and should be set when compiling with --ldflags="-X k8s.io/minikube/pkg/drivers/hyperkit.gitCommitID=" +var gitCommitID = "" + // GetVersion returns the current docker-machine-driver-hyperkit version func GetVersion() string { return version } + +// GetGitCommitID returns the git commit id from which it is being built +func GetGitCommitID() string { + return gitCommitID +}