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-13 20:30:03 +00:00
Code Activity

Makefile: add IMAGE_BUILD_EXTRA_OPTS variable

Browse source
This commit is contained in:
Markus Lehtonen 2018-11-16 15:32:48 +02:00
parent a8e7259bf8
commit 2cfb3ade5d
2 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -2,6 +2,7 @@
.FORCE:
IMAGE_BUILD_CMD := docker build
IMAGE_BUILD_EXTRA_OPTS :=
IMAGE_PUSH_CMD := docker push
VERSION := $(shell git describe --tags --dirty --always)
@ -20,7 +21,8 @@ all: image
image: yamls
$(IMAGE_BUILD_CMD) --build-arg NFD_VERSION=$(VERSION) \
-t $(IMAGE_TAG) ./
-t $(IMAGE_TAG) \
$(IMAGE_BUILD_EXTRA_OPTS) ./
yamls: $(yaml_instances)

21
README.md
View file

@ -611,16 +611,17 @@ attribute in the spec template(s) to the new location
There are several Makefile variables that control the build process and the
name of the resulting container image.
| Variable | Description | Default value
| -------------- | -------------------------------------------- | ----------- |
| IMAGE_BUILD_CMD | Command to build the image | docker build
| IMAGE_PUSH_CMD | Command to push the image to remote registry | docker push
| IMAGE_REGISTRY | Container image registry to use | quay.io/kubernetes_incubator
| IMAGE_NAME | Container image name | node-feature-discovery
| IMAGE_TAG_NAME | Container image tag name | <nfd version>
| IMAGE_REPO | Container image repository to use | <IMAGE_REGISTRY>/<IMAGE_NAME>
| IMAGE_TAG | Full image:tag to tag the image with | <IMAGE_REPO>/<IMAGE_NAME>
| K8S_NAMESPACE | nfd-master and nfd-worker namespace | kube-system
| Variable | Description | Default value
| ---------------------- | -------------------------------------------- | ----------- |
| IMAGE_BUILD_CMD | Command to build the image | docker build
| IMAGE_BUILD_EXTRA_OPTS | Extra options to pass to build command | *empty*
| IMAGE_PUSH_CMD | Command to push the image to remote registry | docker push
| IMAGE_REGISTRY | Container image registry to use | quay.io/kubernetes_incubator
| IMAGE_NAME | Container image name | node-feature-discovery
| IMAGE_TAG_NAME | Container image tag name | <nfd version>
| IMAGE_REPO | Container image repository to use | <IMAGE_REGISTRY>/<IMAGE_NAME>
| IMAGE_TAG | Full image:tag to tag the image with | <IMAGE_REPO>/<IMAGE_NAME>
| K8S_NAMESPACE | nfd-master and nfd-worker namespace | kube-system
For example, to use a custom registry:
```