From fa40c7cfd0453f519e3fbd2f5a60f1f65783fe10 Mon Sep 17 00:00:00 2001 From: "Justin W. Flory" Date: Tue, 27 Jun 2017 15:49:46 -0500 Subject: [PATCH 1/2] Add optional parameter variable to `docker build` in Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5dc6776ec6d2..8922b04a4145 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ out/minikube.iso: $(shell find deploy/iso/minikube-iso -type f) ifeq ($(IN_DOCKER),1) $(MAKE) minikube_iso else - docker run --rm --workdir /mnt --volume $(CURDIR):/mnt \ + docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(DOCKER_EXTRA_ARGS) \ --user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \ $(ISO_BUILD_IMAGE) /usr/bin/make out/minikube.iso endif @@ -191,7 +191,7 @@ localkube-image: out/localkube buildroot-image: $(ISO_BUILD_IMAGE) # convenient alias to build the docker container $(ISO_BUILD_IMAGE): deploy/iso/minikube-iso/Dockerfile - docker build -t $@ -f $< $(dir $<) + docker build $(DOCKER_EXTRA_ARGS) -t $@ -f $< $(dir $<) @echo "" @echo "$(@) successfully built" From 868052f5aa6bf56564d75c48ab6acc36c9a9dab7 Mon Sep 17 00:00:00 2001 From: "Justin W. Flory" Date: Tue, 27 Jun 2017 16:28:50 -0500 Subject: [PATCH 2/2] Use a more clear variable name for ISO building --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8922b04a4145..04df064f571a 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ out/minikube.iso: $(shell find deploy/iso/minikube-iso -type f) ifeq ($(IN_DOCKER),1) $(MAKE) minikube_iso else - docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(DOCKER_EXTRA_ARGS) \ + docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(ISO_DOCKER_EXTRA_ARGS) \ --user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \ $(ISO_BUILD_IMAGE) /usr/bin/make out/minikube.iso endif @@ -191,7 +191,7 @@ localkube-image: out/localkube buildroot-image: $(ISO_BUILD_IMAGE) # convenient alias to build the docker container $(ISO_BUILD_IMAGE): deploy/iso/minikube-iso/Dockerfile - docker build $(DOCKER_EXTRA_ARGS) -t $@ -f $< $(dir $<) + docker build $(ISO_DOCKER_EXTRA_ARGS) -t $@ -f $< $(dir $<) @echo "" @echo "$(@) successfully built"