From 537cf370cab5024defbfbe03b81be7aae65cc487 Mon Sep 17 00:00:00 2001
From: Konrad Kleine <kkleine@redhat.com>
Date: Tue, 10 Oct 2017 14:42:06 +0200
Subject: [PATCH 1/4] Quiet docker build

---
 .make/docker.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.make/docker.mk b/.make/docker.mk
index fe9e3004d2..6fd43617ef 100644
--- a/.make/docker.mk
+++ b/.make/docker.mk
@@ -25,12 +25,12 @@ PACKAGE_PATH=$(GOPATH_IN_CONTAINER)/src/$(PACKAGE_NAME)
 ## Builds the docker image used to build the software.
 docker-image-builder:
 	@echo "Building docker image $(DOCKER_IMAGE_CORE)"
-	docker build -t $(DOCKER_IMAGE_CORE) -f $(CUR_DIR)/Dockerfile.builder $(CUR_DIR)
+	docker build --quiet -t $(DOCKER_IMAGE_CORE) -f $(CUR_DIR)/Dockerfile.builder $(CUR_DIR)
 
 .PHONY: docker-image-deploy
 ## Creates a runnable image using the artifacts from the bin directory.
 docker-image-deploy:
-	docker build -t $(DOCKER_IMAGE_DEPLOY) -f $(CUR_DIR)/Dockerfile.deploy $(CUR_DIR)
+	docker build --quiet -t $(DOCKER_IMAGE_DEPLOY) -f $(CUR_DIR)/Dockerfile.deploy $(CUR_DIR)
 
 .PHONY: docker-publish-deploy
 ## Tags the runnable image and pushes it to the docker hub.

From 9cd6247d329662c7a54baf05763a1a015dcd6996 Mon Sep 17 00:00:00 2001
From: Konrad Kleine <kwk@users.noreply.github.com>
Date: Tue, 10 Oct 2017 14:36:50 +0200
Subject: [PATCH 2/4] Quiet installation of RPM packages in CI

---
 cico_setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cico_setup.sh b/cico_setup.sh
index 5ae9732690..4edecc8a02 100644
--- a/cico_setup.sh
+++ b/cico_setup.sh
@@ -23,7 +23,7 @@ function install_deps() {
   /usr/sbin/setenforce 0
 
   # Get all the deps in
-  yum -y install \
+  yum -y install --quiet \
     docker \
     make \
     git \

From 01b7dd974b13170d9e9f68eaff868fce816d6ff0 Mon Sep 17 00:00:00 2001
From: Konrad Kleine <kkleine@redhat.com>
Date: Tue, 10 Oct 2017 14:44:17 +0200
Subject: [PATCH 3/4] quiet glide install

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a30d229b22..f78323c816 100644
--- a/Makefile
+++ b/Makefile
@@ -229,7 +229,7 @@ clean-glide-cache:
 	-rm -rf ./.glide
 
 $(VENDOR_DIR): glide.lock glide.yaml
-	$(GLIDE_BIN) install
+	$(GLIDE_BIN) --quiet install
 	touch $(VENDOR_DIR)
 
 .PHONY: deps

From b03ad734627d43636a03a7e2ad6024e7afe5d343 Mon Sep 17 00:00:00 2001
From: Konrad Kleine <kkleine@redhat.com>
Date: Tue, 10 Oct 2017 14:55:35 +0200
Subject: [PATCH 4/4] Added hack to make docker pull more quiet

See also https://github.com/docker/compose/issues/3447
---
 .make/test.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.make/test.mk b/.make/test.mk
index b99a8e29a5..db5ae94d1e 100644
--- a/.make/test.mk
+++ b/.make/test.mk
@@ -204,11 +204,11 @@ endef
 ## If not already available, this target will download docker-compose (on Linux).
 integration-test-env-prepare:
 ifdef DOCKER_COMPOSE_BIN
-	@$(DOCKER_COMPOSE_BIN) -f $(DOCKER_COMPOSE_FILE) up -d
+	@$(DOCKER_COMPOSE_BIN) -f $(DOCKER_COMPOSE_FILE) up -d > $(TMP_PATH)/compose-errors.log 2>&1 && echo "DONE" || (echo "ERROR:" && cat $(TMP_PATH)/compose-errors.log)
 else
 ifneq ($(OS),Windows_NT)
 	$(call download-docker-compose)
-	@$(DOCKER_COMPOSE_BIN_ALT) -f $(DOCKER_COMPOSE_FILE) up -d
+	@$(DOCKER_COMPOSE_BIN_ALT) -f $(DOCKER_COMPOSE_FILE) up -d > $(TMP_PATH)/compose-errors.log 2>&1 && echo "DONE" || (echo "ERROR:" && cat $(TMP_PATH)/compose-errors.log)
 else
 	$(error The "$(DOCKER_COMPOSE_BIN_NAME)" executable could not be found in your PATH)
 endif