Allow to override the Makefile's `DOCKER_MOUNT` variable
Through the env variable of the same name.
The idea here is pretty simple: I/O perf on native mounted disks
on non-Linux (notably Mac OS) is just terrible, thus making it
a real pain to develop: one has to choose between re-building
the image after every single change (eg to run a test) or just
work directly inside the same container (eg with vim, but even then
one would have to re-configure their dev container every time
it gets destroyed - containers, after all, are not supposed to
be long-lived).
Allowing to override `DOCKER_MOUNT` makes it easy for everyone
to decide what their volume/syncing strategy is; for example
one can choose to use [docker-sync](https://github.com/EugenMayer/docker-sync)
This patch won't change anything for anyone who doesn't
set the `DOCKER_MOUNT` env variable in their environment.
Signed-off-by: Jean Rouge <jer329@cornell.edu>
Jean Rouge authored on 2018/10/07 03:06:45Showing 1 changed files
| ... | ... |
@@ -62,6 +62,9 @@ DOCKER_ENVS := \ |
| 62 | 62 |
# (default to no bind mount if DOCKER_HOST is set) |
| 63 | 63 |
# note: BINDDIR is supported for backwards-compatibility here |
| 64 | 64 |
BIND_DIR := $(if $(BINDDIR),$(BINDDIR),$(if $(DOCKER_HOST),,bundles)) |
| 65 |
+ |
|
| 66 |
+# DOCKER_MOUNT can be overriden, but use at your own risk! |
|
| 67 |
+ifndef DOCKER_MOUNT |
|
| 65 | 68 |
DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/docker/docker/$(BIND_DIR)") |
| 66 | 69 |
|
| 67 | 70 |
# 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. |
| ... | ... |
@@ -69,13 +72,14 @@ DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/do |
| 69 | 69 |
# 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. |
| 70 | 70 |
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" |
| 71 | 71 |
|
| 72 |
-# This allows to set the docker-dev container name |
|
| 73 |
-DOCKER_CONTAINER_NAME := $(if $(CONTAINER_NAME),--name $(CONTAINER_NAME),) |
|
| 74 |
- |
|
| 75 | 72 |
DOCKER_MOUNT_CACHE := -v docker-dev-cache:/root/.cache |
| 76 | 73 |
DOCKER_MOUNT_CLI := $(if $(DOCKER_CLI_PATH),-v $(shell dirname $(DOCKER_CLI_PATH)):/usr/local/cli,) |
| 77 | 74 |
DOCKER_MOUNT_BASH_COMPLETION := $(if $(DOCKER_BASH_COMPLETION_PATH),-v $(shell dirname $(DOCKER_BASH_COMPLETION_PATH)):/usr/local/completion/bash,) |
| 78 | 75 |
DOCKER_MOUNT := $(DOCKER_MOUNT) $(DOCKER_MOUNT_CACHE) $(DOCKER_MOUNT_CLI) $(DOCKER_MOUNT_BASH_COMPLETION) |
| 76 |
+endif # ifndef DOCKER_MOUNT |
|
| 77 |
+ |
|
| 78 |
+# This allows to set the docker-dev container name |
|
| 79 |
+DOCKER_CONTAINER_NAME := $(if $(CONTAINER_NAME),--name $(CONTAINER_NAME),) |
|
| 79 | 80 |
|
| 80 | 81 |
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null) |
| 81 | 82 |
GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g") |