diff --git a/.dockerignore b/.dockerignore index b605b08c61156f4194448c50132826db13ba3d57..2ce8321a7ea55043e759091094b17438d52b1566 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ bundles -integration-cli/bundles .gopath vendor/pkg .go-pkg-cache diff --git a/Makefile b/Makefile index 7fe4872b04319cd49fb884058239f5f44f90b50d..65589227a849c4c9c073be3afb861a7ec44a90c0 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,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) +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),) diff --git a/hack/make.sh b/hack/make.sh index 8b2a4a975db4c311abc64d6868cb2ee256860e43..7dd86639daac627bec1d5bf0305b533f9d8fe1c5 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -85,7 +85,6 @@ elif command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; t git status --porcelain --untracked-files=no echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" fi - ! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') &> /dev/null else echo >&2 'error: .git directory missing and DOCKER_GITCOMMIT not specified' echo >&2 ' Please either build with the .git directory accessible, or specify the'