From d527d588f3d6d93ee6dc74dcc1c1855d4627ad1e Mon Sep 17 00:00:00 2001 From: Balaji Subramaniam Date: Fri, 9 Dec 2016 11:32:39 -0800 Subject: [PATCH] Fix to report the correct version inside container. - Used build args to pass the correct version. --- Dockerfile | 3 ++- Makefile | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 56fa4d851f..90f61e26e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,13 +30,14 @@ ADD . /go/src/github.com/kubernetes-incubator/node-feature-discovery WORKDIR /go/src/github.com/kubernetes-incubator/node-feature-discovery +ARG NFD_VERSION RUN git clone --depth 1 https://github.com/01org/intel-cmt-cat.git RUN cd intel-cmt-cat/lib; make install RUN cd rdt-discovery; make RUN go get github.com/Masterminds/glide RUN glide install RUN go install \ - -ldflags "-s -w -X main.version=`git describe --tags --dirty --always`" \ + -ldflags "-s -w -X main.version=$NFD_VERSION" \ github.com/kubernetes-incubator/node-feature-discovery ENTRYPOINT ["/go/bin/node-feature-discovery"] diff --git a/Makefile b/Makefile index 9e1eee4091..aa2618ad7e 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ VERSION := $(shell git describe --tags --dirty --always) all: docker # To override QUAY_REGISTRY_USER use the -e option as follows: -# QUAY_REGISTRY_USER= make docker -e +# QUAY_REGISTRY_USER= make docker -e. docker: - docker build -t $(QUAY_DOMAIN_NAME)/$(QUAY_REGISTRY_USER)/$(DOCKER_IMAGE_NAME):$(VERSION) ./ + docker build --build-arg NFD_VERSION=$(VERSION) \ + -t $(QUAY_DOMAIN_NAME)/$(QUAY_REGISTRY_USER)/$(DOCKER_IMAGE_NAME):$(VERSION) ./