From b1e6536ceb8a4eeaecee6d9bcf2ef37d3a25d127 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Mon, 3 Jun 2019 16:05:23 -0700 Subject: [PATCH] Set DOCKER_BINDDIR mount options from env Adds `DOCKER_BINDDIR_MOUNT_OPTS` to easily tweak the BINDDIR mount options... primarily adding so I can control the caching mode for osxfs because compiling takes > 1min for me with the default and < 30s with both `cached` and `delegated`. Signed-off-by: Brian Goff --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index f778902fe6..80360fb236 100644 --- a/Makefile +++ b/Makefile @@ -79,6 +79,7 @@ BIND_DIR := $(if $(BINDDIR),$(BINDDIR),$(if $(DOCKER_HOST),,bundles)) # DOCKER_MOUNT can be overriden, but use at your own risk! ifndef DOCKER_MOUNT DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/docker/docker/$(BIND_DIR)") +DOCKER_MOUNT := $(if $(DOCKER_BINDDIR_MOUNT_OPTS),$(DOCKER_MOUNT):$(DOCKER_BINDDIR_MOUNT_OPTS),$(DOCKER_MOUNT)) # 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`.