Add optional parameter variable to docker build in Makefile
#1657
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
the
cncf-cla: yes
|
Can one of the admins verify this patch? |
|
@minikube-bot ok to test |
r2d4
reviewed
Jun 27, 2017
Makefile
Outdated
| @@ -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) \ | |||
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
@r2d4 Yeah, this makes a lot of sense and this proposed name sounds good to me. I'll change this really quick.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Add an optional variable (
$ISO_DOCKER_EXTRA_ARGS) that can be passed via the command line to add additional parameters todocker build.Description
This change is helpful for people who might be trying to build a Minikube ISO in a local environment and need to use additional parameters to get it to build successfully. My use case for this is mounting a volume from the host with custom SSL certificates, so the build is able to complete (otherwise it fails when it tries to pull
dumb-initfrom GitHub).I tested and verified this to work on RHEL 7.3 and Fedora 26. It also works for me with if I pass arguments or not. Ultimately, I think it's a pretty self-explanatory change, but I'm really new to the Kubernetes / Minikube world, so I'm very open to feedback!
Note about docs
As an additional note, I'm more than willing to update the docs with this PR to explain the variable, but wanted to get feedback on the change before doing so.