Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add optional parameter variable to docker build in Makefile #1657

Merged
merged 2 commits into from
Jun 27, 2017
Merged

Add optional parameter variable to docker build in Makefile #1657

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa40c7c
Add optional parameter variable to `docker build` in Makefile
jwflory Jun 27, 2017
868052f
Use a more clear variable name for ISO building
jwflory Jun 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only comment here would be to make it clear that this option is only for the docker build of the iso. Since we have other docker build rules and they are going to become more prominent soon (see #1656)

Maybe $(ISO_DOCKER_EXTRA_ARGS) or something?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@r2d4 Yeah, this makes a lot of sense and this proposed name sounds good to me. I'll change this really quick.

--user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \
$(ISO_BUILD_IMAGE) /usr/bin/make out/minikube.iso
endif
Expand Down Expand Up @@ -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"

Expand Down