mirrors/node-feature-discovery
mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2025-03-30 19:54:46 +00:00
Code Activity

Merge pull request #58 from balajismaniam/fix-nfd-version-suffix

Browse source 
Automatic merge from submit-queue

Fix to report the correct version inside container.

Fixes https://github.com/kubernetes-incubator/node-feature-discovery/issues/54. Tested manually.
- Removed demo directory from .dockerignore.
This commit is contained in:
nfd-merge-bot 2016-12-09 14:06:30 -08:00 • committed by GitHub
commit 0569d224da
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -30,13 +30,14 @@ ADD . /go/src/github.com/kubernetes-incubator/node-feature-discovery
WORKDIR /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 git clone --depth 1 https://github.com/01org/intel-cmt-cat.git
RUN cd intel-cmt-cat/lib; make install RUN cd intel-cmt-cat/lib; make install
RUN cd rdt-discovery; make RUN cd rdt-discovery; make
RUN go get github.com/Masterminds/glide RUN go get github.com/Masterminds/glide
RUN glide install RUN glide install
RUN go 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 github.com/kubernetes-incubator/node-feature-discovery
ENTRYPOINT ["/go/bin/node-feature-discovery"] ENTRYPOINT ["/go/bin/node-feature-discovery"]

5
Makefile
View file

@ -9,6 +9,7 @@ VERSION := $(shell git describe --tags --dirty --always)
all: docker all: docker
# To override QUAY_REGISTRY_USER use the -e option as follows: # To override QUAY_REGISTRY_USER use the -e option as follows:
# QUAY_REGISTRY_USER=<my-username> make docker -e # QUAY_REGISTRY_USER=<my-username> make docker -e.
docker: 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) ./