From 0314a86e039a5aaf24df1e3f11258155b62db768 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Mon, 29 Feb 2016 13:00:50 +0000 Subject: [PATCH] Autodetect if we talk to docker via tcp in the Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c29af3ca..c5143979 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ PUBLISH=publish_weave publish_weaveexec publish_plugin .PHONY: all exes testrunner update tests lint publish $(PUBLISH) clean clean-bin prerequisites build run-smoketests # If you can use docker without being root, you can do "make SUDO=" -SUDO=sudo -E +SUDO=$(shell docker info >/dev/null 2>&1 || echo "sudo -E") BUILD_IN_CONTAINER=true RM=--rm RUN_FLAGS=-ti