Merge pull request #20398 from mfanjie/mfanjie-patch-1

Auto commit by PR queue bot
2016-02-09 22:55:18 -08:00
parent 1dd703921f aaea05980c
commit fc3316ee1b
3 changed files with 33 additions and 14 deletions
--- a/build/build-image/Dockerfile
+++ b/build/build-image/Dockerfile
@@ -22,6 +22,10 @@ MAINTAINER  Joe Beda <jbeda@google.com>

 ENV GOOS    linux
 ENV GOARCH  amd64
+ENV http_proxy KUBE_BUILD_HTTP_PROXY
+ENV https_proxy KUBE_BUILD_HTTPS_PROXY
+ENV no_proxy KUBE_BUILD_NO_PROXY
+

 # work around 64MB tmpfs size in Docker 1.6
 ENV TMPDIR /tmp.k8s