From 766917be06fa0d24c34b4e0db9668e94cedf37b8 Mon Sep 17 00:00:00 2001 From: "Fangming.Fang" Date: Fri, 23 Mar 2018 06:39:03 +0000 Subject: [PATCH] Add quotation marks for $CURDIR This change fixes bug when $CURDIR contains special character e.g. '&&'. Change-Id: I658eb60d97c2229cf8b4e0a61dbbecf3edc9d573 Signed-off-by: Fangming.Fang Upstream-commit: 83062593d7ce759bb96e271e30460afa4a695dba Component: engine --- components/engine/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/Makefile b/components/engine/Makefile index 4edf29b53a..3c19caa864 100644 --- a/components/engine/Makefile +++ b/components/engine/Makefile @@ -66,7 +66,7 @@ DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/do # This allows the test suite to be able to run without worrying about the underlying fs used by the container running the daemon (e.g. aufs-on-aufs), so long as the host running the container is running a supported fs. # The volume will be cleaned up when the container is removed due to `--rm`. # Note that `BIND_DIR` will already be set to `bundles` if `DOCKER_HOST` is not set (see above BIND_DIR line), in such case this will do nothing since `DOCKER_MOUNT` will already be set. -DOCKER_MOUNT := $(if $(DOCKER_MOUNT),$(DOCKER_MOUNT),-v /go/src/github.com/docker/docker/bundles) -v $(CURDIR)/.git:/go/src/github.com/docker/docker/.git +DOCKER_MOUNT := $(if $(DOCKER_MOUNT),$(DOCKER_MOUNT),-v /go/src/github.com/docker/docker/bundles) -v "$(CURDIR)/.git:/go/src/github.com/docker/docker/.git" # This allows to set the docker-dev container name DOCKER_CONTAINER_NAME := $(if $(CONTAINER_NAME),--name $(CONTAINER_NAME),)