Browse code
Merge pull request #24280 from miaoyq/24261-fix-make-docker-py-err
Fix 'make test-docker-py' error
Sebastiaan van Stijn authored on 2016/07/16 09:07:23Showing 1 changed files
| ... | ... |
@@ -26,7 +26,13 @@ DOCKER_ENVS := \ |
| 26 | 26 |
-e DOCKER_USERLANDPROXY \ |
| 27 | 27 |
-e TESTDIRS \ |
| 28 | 28 |
-e TESTFLAGS \ |
| 29 |
- -e TIMEOUT |
|
| 29 |
+ -e TIMEOUT \ |
|
| 30 |
+ -e HTTP_PROXY \ |
|
| 31 |
+ -e HTTPS_PROXY \ |
|
| 32 |
+ -e NO_PROXY \ |
|
| 33 |
+ -e http_proxy \ |
|
| 34 |
+ -e https_proxy \ |
|
| 35 |
+ -e no_proxy |
|
| 30 | 36 |
# 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 |
| 31 | 37 |
|
| 32 | 38 |
# to allow `make BIND_DIR=. shell` or `make BIND_DIR= test` |