Skip to content
This repository has been archived by the owner on Mar 11, 2021. It is now read-only.

Quiet CI #1704

Merged
merged 4 commits into from
Oct 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .make/docker.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions .make/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cico_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down