From 18955c63d45cffd7c656178a5dca5fb6ffc0d5d0 Mon Sep 17 00:00:00 2001 From: Tomas Kral Date: Sat, 11 Feb 2017 17:05:08 +0100 Subject: [PATCH] fix passing gitcommit in version output --- Makefile | 2 +- cmd/version.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1bf5ea2d..bb92f0d5 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ GITCOMMIT := $(shell git rev-parse --short HEAD) -BUILD_FLAGS := -ldflags="-w -X github.com/kubernetes-incubator/kompose/version.GITCOMMIT=$(GITCOMMIT)" +BUILD_FLAGS := -ldflags="-w -X github.com/kubernetes-incubator/kompose/cmd.GITCOMMIT=$(GITCOMMIT)" PKGS := $(shell glide novendor) TEST_IMAGE := kompose/tests:latest diff --git a/cmd/version.go b/cmd/version.go index 9a3cc091..e9ee1ee6 100644 --- a/cmd/version.go +++ b/cmd/version.go @@ -26,7 +26,9 @@ var ( // VERSION is version number that wil be displayed when running ./kompose version VERSION = "0.2.0" // GITCOMMIT is hash of the commit that wil be displayed when running ./kompose version - GITCOMMIT = "64433fd" + // this will be overwritten when running build like this: go build -ldflags="-X github.com/kubernetes-incubator/kompose/cmd.GITCOMMIT=$(GITCOMMIT)" + // HEAD is default indicating that this was not set during build + GITCOMMIT = "HEAD" ) // versionCmd represents the version command