mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-15 17:50:49 +00:00
Code Activity

Dockerfile: rename version ARG

Browse source 
Use the same naming across Makefile and Dockerfile.
This commit is contained in:
Markus Lehtonen 2020-05-19 12:21:37 +03:00
parent 342c1dfbc6
commit 1f873f0dfc
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -11,10 +11,10 @@ RUN go mod download
# Do actual build # Do actual build
COPY . /go/node-feature-discovery COPY . /go/node-feature-discovery
ARG NFD_VERSION ARG VERSION
ARG HOSTMOUNT_PREFIX ARG HOSTMOUNT_PREFIX
RUN make install VERSION=$NFD_VERSION HOSTMOUNT_PREFIX=$HOSTMOUNT_PREFIX RUN make install VERSION=$VERSION HOSTMOUNT_PREFIX=$HOSTMOUNT_PREFIX
RUN make test RUN make test

2
Makefile
View file

@ -44,7 +44,7 @@ install:
$(GO_CMD) install -v $(LDFLAGS) ./cmd/... $(GO_CMD) install -v $(LDFLAGS) ./cmd/...
image: yamls image: yamls
$(IMAGE_BUILD_CMD) --build-arg NFD_VERSION=$(VERSION) \ $(IMAGE_BUILD_CMD) --build-arg VERSION=$(VERSION) \
--build-arg HOSTMOUNT_PREFIX=$(CONTAINER_HOSTMOUNT_PREFIX) \ --build-arg HOSTMOUNT_PREFIX=$(CONTAINER_HOSTMOUNT_PREFIX) \
-t $(IMAGE_TAG) \ -t $(IMAGE_TAG) \
$(IMAGE_BUILD_EXTRA_OPTS) ./ $(IMAGE_BUILD_EXTRA_OPTS) ./