Browse Source

Merge pull request #581 from mbruzek/mbruzek-remove-tty-Makefile

Removing the -it flag from the docker build commands.
Tom Denham 8 years ago
parent
commit
6d631ba9f7
1 changed files with 3 additions and 3 deletions
  1. 3 3
      Makefile

+ 3 - 3
Makefile

@@ -98,7 +98,7 @@ endif
 dist/flanneld-$(ARCH):
 	# Build for other platforms with ARCH=$$ARCH make build
 	# valid values for $$ARCH are [amd64 arm arm64 ppc64le]
-	docker run -e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) -it \
+	docker run -e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) \
 		-u $(shell id -u):$(shell id -g) \
 	    -v ${PWD}:/go/src/github.com/coreos/flannel:ro \
         -v ${PWD}/dist:/go/src/github.com/coreos/flannel/dist \
@@ -110,11 +110,11 @@ dist/flanneld-$(ARCH):
 
 ## Busybox images are missing pthread. Pull it out of the kube-cross image
 dist/libpthread.so.0-$(ARCH):
-	docker run -ti --rm -v `pwd`:/host gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) cp /lib/$(LIB_DIR)/libpthread.so.0 /host/dist/libpthread.so.0-$(ARCH)
+	docker run --rm -v `pwd`:/host gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) cp /lib/$(LIB_DIR)/libpthread.so.0 /host/dist/libpthread.so.0-$(ARCH)
 
 ## Build an architecture specific iptables binary
 dist/iptables-$(ARCH):
-	docker run -e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) -it \
+	docker run -e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) \
 			-u $(shell id -u):$(shell id -g) \
             -v ${PWD}:/go/src/github.com/coreos/flannel:ro \
             -v ${PWD}/dist:/go/src/github.com/coreos/flannel/dist \