Fix make when behind http proxy #131
Merged
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
* Update to latest build submodule * Use curl instead of wget to retrieve image * Allow BUILD_ARGS from environment to support proxy variables Signed-off-by: Bob Haddleton <bob.haddleton@nokia.com>
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.
Signed-off-by: Bob Haddleton bob.haddleton@nokia.com
Description of your changes
Updated the Dockerfile to install curl and use it in place of wget - curl works with
the http_proxy and https_proxy environment variables
Updated the Makefile to allow external BUILD_ARGS to be passed in so that the env variables can be passed
into the docker build command without modifying the Dockerfile
For example: make BUILD_ARGS="--build-arg http_proxy=http://my.proxy.com --build-arg https_proxy=http://my.proxy.com"
Fixes #130
I have:
make reviewable testto ensure this PR is ready for review.How has this code been tested
Generated an image and running it in our development environment