Skip to content

Commit 54aa3a3

Browse files
committed
set the default storage driver as the users current default
Signed-off-by: Jess Frazelle <[email protected]>
1 parent f4dfe15 commit 54aa3a3

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
.PHONY: all binary build cross default docs docs-build docs-shell shell test test-docker-py test-integration-cli test-unit validate
22

3+
# set the graph driver as the current graphdriver if not set
4+
DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info | grep "Storage Driver" | sed 's/.*: //'))
5+
36
# get OS/Arch of docker engine
47
DOCKER_OSARCH := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKER_ENGINE_OSARCH:-$$DOCKER_CLIENT_OSARCH}')
58
DOCKERFILE := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKERFILE}')
@@ -15,7 +18,7 @@ DOCKER_ENVS := \
1518
-e DOCKER_CLIENTONLY \
1619
-e DOCKER_DEBUG \
1720
-e DOCKER_EXPERIMENTAL \
18-
-e DOCKER_GRAPHDRIVER \
21+
-e DOCKER_GRAPHDRIVER=$(DOCKER_GRAPHDRIVER) \
1922
-e DOCKER_INCREMENTAL_BINARY \
2023
-e DOCKER_REMAP_ROOT \
2124
-e DOCKER_STORAGE_OPTS \

0 commit comments

Comments
 (0)