From b967e381aac05bd309a0ce9eb2f0c46d4a60d8a7 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 6 Apr 2016 14:45:32 -0700 Subject: [PATCH] remove docker info warnings (if any) from Makefile Signed-off-by: Victor Vieux --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 332d1a0368..05c3f32e1d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .PHONY: all binary build build-gccgo cross default docs docs-build docs-shell shell gccgo test test-docker-py test-integration-cli test-unit validate help # set the graph driver as the current graphdriver if not set -DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info | grep "Storage Driver" | sed 's/.*: //')) +DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info 2>&1 | grep "Storage Driver" | sed 's/.*: //')) # get OS/Arch of docker engine DOCKER_OSARCH := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKER_ENGINE_OSARCH:-$$DOCKER_CLIENT_OSARCH}')