From ffff54ffda6cbacbdda7a0af4f222a06ce5ece7f Mon Sep 17 00:00:00 2001 From: Yanqiang Miao Date: Sun, 3 Jul 2016 17:01:27 +0800 Subject: [PATCH] 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