Skip to content

Commit 3950629

Browse files
authored
Merge pull request #1657 from jflory7/change/makefile-docker-parameter
Add optional parameter variable to `docker build` in Makefile
2 parents 5a47777 + 868052f commit 3950629

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ out/minikube.iso: $(shell find deploy/iso/minikube-iso -type f)
9898
ifeq ($(IN_DOCKER),1)
9999
$(MAKE) minikube_iso
100100
else
101-
docker run --rm --workdir /mnt --volume $(CURDIR):/mnt \
101+
docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(ISO_DOCKER_EXTRA_ARGS) \
102102
--user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \
103103
$(ISO_BUILD_IMAGE) /usr/bin/make out/minikube.iso
104104
endif
@@ -191,7 +191,7 @@ localkube-image: out/localkube
191191

192192
buildroot-image: $(ISO_BUILD_IMAGE) # convenient alias to build the docker container
193193
$(ISO_BUILD_IMAGE): deploy/iso/minikube-iso/Dockerfile
194-
docker build -t $@ -f $< $(dir $<)
194+
docker build $(ISO_DOCKER_EXTRA_ARGS) -t $@ -f $< $(dir $<)
195195
@echo ""
196196
@echo "$(@) successfully built"
197197

0 commit comments

Comments
 (0)