Pārlūkot izejas kodu

Merge pull request #39312 from cpuguy83/binddir_cache

Set DOCKER_BINDDIR mount options from env
Sebastiaan van Stijn 6 gadi atpakaļ
vecāks
revīzija
c13dab6bd8
1 mainītis faili ar 1 papildinājumiem un 0 dzēšanām
  1. 1 0
      Makefile

+ 1 - 0
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`.