From e0cea0e2b1bc65906a9bd6eb3045355514bc0f59 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Thu, 29 Oct 2015 14:15:39 +0000
Subject: [PATCH] docker run -ti is problematic for automation.

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 56ca020c7..21f821599 100644
--- a/Makefile
+++ b/Makefile
@@ -43,7 +43,7 @@ $(PROBE_EXE): probe/*.go probe/docker/*.go probe/kubernetes/*.go probe/endpoint/
 
 ifeq ($(BUILD_IN_CONTAINER),true)
 $(APP_EXE) $(PROBE_EXE) $(RUNSVINIT): $(SCOPE_BACKEND_BUILD_UPTODATE)
-	$(SUDO) docker run -ti $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope -e GOARCH -e GOOS \
+	$(SUDO) docker run $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope -e GOARCH -e GOOS \
 		$(SCOPE_BACKEND_BUILD_IMAGE) $@
 else
 $(APP_EXE) $(PROBE_EXE):
@@ -67,22 +67,22 @@ static: client/build/app.js
 ifeq ($(BUILD_IN_CONTAINER),true)
 client/build/app.js: $(shell find client/app/scripts -type f)
 	mkdir -p client/build
-	$(SUDO) docker run -ti $(RM) -v $(shell pwd)/client/app:/home/weave/app \
+	$(SUDO) docker run $(RM) -v $(shell pwd)/client/app:/home/weave/app \
 		-v $(shell pwd)/client/build:/home/weave/build \
 		$(SCOPE_UI_BUILD_IMAGE) npm run build
 
 client-test: $(shell find client/app/scripts -type f)
-	$(SUDO) docker run -ti $(RM) -v $(shell pwd)/client/app:/home/weave/app \
+	$(SUDO) docker run $(RM) -v $(shell pwd)/client/app:/home/weave/app \
 		-v $(shell pwd)/client/test:/home/weave/test \
 		$(SCOPE_UI_BUILD_IMAGE) npm test
 
 client-lint:
-	$(SUDO) docker run -ti $(RM) -v $(shell pwd)/client/app:/home/weave/app \
+	$(SUDO) docker run $(RM) -v $(shell pwd)/client/app:/home/weave/app \
 		-v $(shell pwd)/client/test:/home/weave/test \
 		$(SCOPE_UI_BUILD_IMAGE) npm run lint
 
 client-start:
-	$(SUDO) docker run -ti $(RM) --net=host -v $(shell pwd)/client/app:/home/weave/app \
+	$(SUDO) docker run $(RM) --net=host -v $(shell pwd)/client/app:/home/weave/app \
 		-v $(shell pwd)/client/build:/home/weave/build \
 		$(SCOPE_UI_BUILD_IMAGE) npm start
 endif
@@ -105,7 +105,7 @@ clean:
 
 ifeq ($(BUILD_IN_CONTAINER),true)
 tests:
-	$(SUDO) docker run -ti $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope \
+	$(SUDO) docker run $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope \
 		-e GOARCH -e GOOS -e CIRCLECI --entrypoint=/bin/sh $(SCOPE_BACKEND_BUILD_IMAGE) -c \
 		"cd /go/src/github.com/weaveworks/scope && ./tools/test -no-go-get"
 else