From 0e75f74ca880395292c5647826fbaad1d504c89e Mon Sep 17 00:00:00 2001 From: Sam Broughton Date: Tue, 5 Dec 2017 17:10:49 +0000 Subject: [PATCH] Don't call `sudo docker` when building on macOS --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8393762..f2d9bfb 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ DH_ORG=weaveworks VERSION=$(shell git symbolic-ref --short HEAD)-$(shell git rev-parse --short HEAD) +SUDO=$(shell docker info >/dev/null 2>&1 || echo "sudo -E") all: image @@ -22,13 +23,13 @@ cmd/kured/kured: cmd/kured/*.go build/.image.done: cmd/kured/Dockerfile cmd/kured/kured mkdir -p build cp $^ build - sudo -E docker build -t quay.io/$(DH_ORG)/kured:$(VERSION) -f build/Dockerfile ./build + $(SUDO) docker build -t quay.io/$(DH_ORG)/kured:$(VERSION) -f build/Dockerfile ./build touch $@ image: build/.image.done publish-image: image - sudo -E docker push quay.io/$(DH_ORG)/kured:$(VERSION) + $(SUDO) docker push quay.io/$(DH_ORG)/kured:$(VERSION) minikube-publish: image - sudo -E docker save quay.io/$(DH_ORG)/kured:$(VERSION) | (eval $$(minikube docker-env) && docker load) + $(SUDO) docker save quay.io/$(DH_ORG)/kured:$(VERSION) | (eval $$(minikube docker-env) && docker load)