mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
@@ -1,5 +1,4 @@
|
|||||||
bundles
|
bundles
|
||||||
integration-cli/bundles
|
|
||||||
.gopath
|
.gopath
|
||||||
vendor/pkg
|
vendor/pkg
|
||||||
.go-pkg-cache
|
.go-pkg-cache
|
||||||
|
|||||||
2
Makefile
2
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.
|
# 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`.
|
# 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.
|
# 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
|
# This allows to set the docker-dev container name
|
||||||
DOCKER_CONTAINER_NAME := $(if $(CONTAINER_NAME),--name $(CONTAINER_NAME),)
|
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
|
|||||||
git status --porcelain --untracked-files=no
|
git status --porcelain --untracked-files=no
|
||||||
echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
|
||||||
fi
|
fi
|
||||||
! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/') &> /dev/null
|
|
||||||
else
|
else
|
||||||
echo >&2 'error: .git directory missing and DOCKER_GITCOMMIT not specified'
|
echo >&2 'error: .git directory missing and DOCKER_GITCOMMIT not specified'
|
||||||
echo >&2 ' Please either build with the .git directory accessible, or specify the'
|
echo >&2 ' Please either build with the .git directory accessible, or specify the'
|
||||||
|
|||||||
Reference in New Issue
Block a user