-
Notifications
You must be signed in to change notification settings - Fork 8.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Respect proxy settings in build scripts
Respect proxy settings to build Fabric behind a proxy. Set environment values http_proxy, HTTP_PROXY, https_proxy or HTTPS_PROXY and execute `make peer`. This patch fixes FAB-308. To build docker javaenv-image, the Internet access is needed for wget Gradle distribution. So we need to pass proxy configurations by build arg to Docker. Additionally, in core/chaincode/shim/java/build.gradle, Gradle will get com.google.protobuf plugin from the Internet during build process. Because this process is executed in docker-build, defining JAVA_OPTS in the host, which execute docker-build, is no effect. Signed-off-by: Namiki Yuta <y.namiki@gmail.com> Change-Id: I226c115f49ec242b79ef56a34c03012fb11f78c6
- Loading branch information
Namiki Yuta
committed
Nov 25, 2016
1 parent
1a52284
commit ee2b426
Showing
2 changed files
with
41 additions
and
1 deletion.
There are no files selected for viewing
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
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