From ffff54ffda6cbacbdda7a0af4f222a06ce5ece7f Mon Sep 17 00:00:00 2001 From: Yanqiang Miao Date: Sun, 3 Jul 2016 17:01:27 +0800 Subject: [PATCH 1/2] Fix 'make docker-py' error Signed-off-by: Yanqiang Miao Upstream-commit: bbfda85261173b556c8e38930fd7dfff679e36cd Component: engine --- components/engine/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index cbfa3bb80c..088cff31e0 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -44,7 +44,7 @@ GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g") DOCKER_IMAGE := docker-dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN)) DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN)) -DOCKER_FLAGS := docker run --rm -i --privileged $(DOCKER_ENVS) $(DOCKER_MOUNT) +DOCKER_FLAGS := docker run --rm -i --privileged $(DOCKER_USERDEF_ENVS) $(DOCKER_ENVS) $(DOCKER_MOUNT) # if this session isn't interactive, then we don't want to allocate a # TTY, which would fail, but if it is interactive, we do want to attach From 2b20a57f6861ef13d1f52dc85afb9b4f5eb186a2 Mon Sep 17 00:00:00 2001 From: Yanqiang Miao Date: Sat, 9 Jul 2016 11:52:33 +0800 Subject: [PATCH 2/2] Fix 'make test-docker-py' error Signed-off-by: Yanqiang Miao Upstream-commit: c125bbd5e8dcbc0d64d2489df0dc901cb4f62ff4 Component: engine --- components/engine/Makefile | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index 088cff31e0..a37d4e05c3 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -25,7 +25,13 @@ DOCKER_ENVS := \ -e DOCKER_USERLANDPROXY \ -e TESTDIRS \ -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 # to allow `make BIND_DIR=. shell` or `make BIND_DIR= test` @@ -44,7 +50,7 @@ GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g") DOCKER_IMAGE := docker-dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN)) DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN)) -DOCKER_FLAGS := docker run --rm -i --privileged $(DOCKER_USERDEF_ENVS) $(DOCKER_ENVS) $(DOCKER_MOUNT) +DOCKER_FLAGS := docker run --rm -i --privileged $(DOCKER_ENVS) $(DOCKER_MOUNT) # if this session isn't interactive, then we don't want to allocate a # TTY, which would fail, but if it is interactive, we do want to attach