浏览代码

Merge pull request #24280 from miaoyq/24261-fix-make-docker-py-err

Fix 'make test-docker-py' error
Sebastiaan van Stijn 9 年之前
父节点
当前提交
13fcbe3d53
共有 1 个文件被更改,包括 7 次插入1 次删除
  1. 7 1
      Makefile

+ 7 - 1
Makefile

@@ -26,7 +26,13 @@ DOCKER_ENVS := \
 	-e DOCKER_USERLANDPROXY \
 	-e DOCKER_USERLANDPROXY \
 	-e TESTDIRS \
 	-e TESTDIRS \
 	-e TESTFLAGS \
 	-e TESTFLAGS \
-	-e TIMEOUT
+	-e TIMEOUT \
+	-e HTTP_PROXY \
+	-e HTTPS_PROXY \
+	-e NO_PROXY \
+	-e http_proxy \
+	-e https_proxy \
+	-e no_proxy
 # note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds
 # note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds
 
 
 # to allow `make BIND_DIR=. shell` or `make BIND_DIR= test`
 # to allow `make BIND_DIR=. shell` or `make BIND_DIR= test`