From 2e5f88b285ee8b73b59c1a74d599bee230b4079e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 4 Oct 2014 07:48:08 -0400 Subject: [PATCH] Use -qq flag on apt-get to quiet installations of packages --- Makefile | 6 +++--- Vagrantfile | 2 +- bootstrap.sh | 4 ++-- plugins/nginx-vhosts/install | 2 +- tests/ci/receiver | 2 +- tests/ci/setup.sh | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index cfac50ca2..d4e58fea6 100644 --- a/Makefile +++ b/Makefile @@ -47,14 +47,14 @@ docker: aufs echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list apt-get update ifdef DOCKER_VERSION - apt-get install -y lxc-docker-${DOCKER_VERSION} + apt-get install -qq -y lxc-docker-${DOCKER_VERSION} else - apt-get install -y lxc-docker + apt-get install -qq -y lxc-docker endif sleep 2 # give docker a moment i guess aufs: - lsmod | grep aufs || modprobe aufs || apt-get install -y linux-image-extra-`uname -r` + lsmod | grep aufs || modprobe aufs || apt-get install -qq -y linux-image-extra-`uname -r` > /dev/null stack: ifdef BUILD_STACK diff --git a/Vagrantfile b/Vagrantfile index 005f6c3b5..8f4d8e700 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -29,5 +29,5 @@ Vagrant::configure("2") do |config| vb.customize ["modifyvm", :id, "--memory", BOX_MEMORY] end - config.vm.provision :shell, :inline => "apt-get -y install git && cd /root/dokku && #{make_cmd}" + config.vm.provision :shell, :inline => "apt-get -qq -y install git > /dev/null && cd /root/dokku && #{make_cmd}" end diff --git a/bootstrap.sh b/bootstrap.sh index 0acc430a7..7cf58ceab 100644 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -10,9 +10,9 @@ then fi apt-get update -apt-get install -y git make curl software-properties-common +apt-get install -qq -y git make curl software-properties-common -[[ `lsb_release -sr` == "12.04" ]] && apt-get install -y python-software-properties +[[ `lsb_release -sr` == "12.04" ]] && apt-get install -qq -y python-software-properties cd ~ && test -d dokku || git clone $DOKKU_REPO cd dokku diff --git a/plugins/nginx-vhosts/install b/plugins/nginx-vhosts/install index bcbc1f063..7a28d958c 100755 --- a/plugins/nginx-vhosts/install +++ b/plugins/nginx-vhosts/install @@ -4,7 +4,7 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x # latest stable NGINX 1.4.x with websocket support add-apt-repository -y ppa:nginx/stable apt-get update -apt-get install -y nginx dnsutils +apt-get install -qq -y nginx dnsutils if ! grep -q dokku-nginx-reload "/etc/sudoers"; then touch /etc/sudoers.tmp diff --git a/tests/ci/receiver b/tests/ci/receiver index 710a01df0..2d3db4aac 100755 --- a/tests/ci/receiver +++ b/tests/ci/receiver @@ -11,7 +11,7 @@ if [[ $2 == *dokku* ]]; then cd /tmp/build tar -xf - echo "-----> Installing dependencies" - DEBIAN_FRONTEND=noninteractive apt-get install -y git make curl software-properties-common + DEBIAN_FRONTEND=noninteractive apt-get install -qq -y git make curl software-properties-common echo "-----> Set hostname to dokku.me" hostname dokku.me echo "-----> Enabling tracing" diff --git a/tests/ci/setup.sh b/tests/ci/setup.sh index d020280af..d22fafefa 100755 --- a/tests/ci/setup.sh +++ b/tests/ci/setup.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash set -eo pipefail -export DEBIAN_FRONTEND=noninteractive -apt-get install -y git make curl +export DEBIAN_FRONTEND=noninteractive +apt-get install -qq -y git make curl cd /tmp @@ -24,4 +24,4 @@ EOF cat< /etc/rc.local curl https://raw.github.com/progrium/dokku/master/tests/ci/receiver -s > /tmp/receiver chmod +x /tmp/receiver -EOF \ No newline at end of file +EOF