Signed-off-by: Vincent Demeester <vincent@sbr.pm>
| ... | ... |
@@ -52,7 +52,7 @@ DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/do |
| 52 | 52 |
# 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. |
| 53 | 53 |
# The volume will be cleaned up when the container is removed due to `--rm`. |
| 54 | 54 |
# 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. |
| 55 |
-DOCKER_MOUNT := $(if $(DOCKER_MOUNT),$(DOCKER_MOUNT),-v /go/src/github.com/docker/docker/bundles) |
|
| 55 |
+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 |
|
| 56 | 56 |
|
| 57 | 57 |
# This allows to set the docker-dev container name |
| 58 | 58 |
DOCKER_CONTAINER_NAME := $(if $(CONTAINER_NAME),--name $(CONTAINER_NAME),) |
| ... | ... |
@@ -85,7 +85,6 @@ elif command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; t |
| 85 | 85 |
git status --porcelain --untracked-files=no |
| 86 | 86 |
echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" |
| 87 | 87 |
fi |
| 88 |
- ! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') &> /dev/null |
|
| 89 | 88 |
else |
| 90 | 89 |
echo >&2 'error: .git directory missing and DOCKER_GITCOMMIT not specified' |
| 91 | 90 |
echo >&2 ' Please either build with the .git directory accessible, or specify the' |