mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2024-12-14 11:57:51 +00:00
generate: use common builder base image
Use the same base image (golang) for auto-generation as for building container images. This makes sure that we stay in sync in terms of the golang version used.
This commit is contained in:
parent
2bbfe3edc8
commit
81fbc685df
2 changed files with 6 additions and 2 deletions
|
@ -1,4 +1,5 @@
|
|||
FROM golang:1.18-buster as builder
|
||||
ARG BUILDER_IMAGE
|
||||
FROM ${BUILDER_IMAGE} as builder
|
||||
|
||||
# Install tools
|
||||
RUN go install github.com/vektra/mockery/v2@v2.13.0 && \
|
||||
|
|
5
Makefile
5
Makefile
|
@ -127,7 +127,10 @@ templates:
|
|||
@rm nfd-worker.conf.tmp
|
||||
|
||||
.generator.image.stamp: Dockerfile_generator
|
||||
$(IMAGE_BUILD_CMD) -t nfd-generator -f Dockerfile_generator .
|
||||
$(IMAGE_BUILD_CMD) \
|
||||
--build-arg BUILDER_IMAGE=$(BUILDER_IMAGE) \
|
||||
-t nfd-generator \
|
||||
-f Dockerfile_generator .
|
||||
|
||||
generate: .generator.image.stamp
|
||||
$(CONTAINER_RUN_CMD) --rm \
|
||||
|
|
Loading…
Reference in a new issue