Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add -q to apt-get calls #75

Merged
merged 1 commit into from
Jun 12, 2018
Merged

Add -q to apt-get calls #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cache/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
FROM ubuntu

VOLUME ["/var/cache/apt-cacher-ng"]
RUN apt-get update && apt-get install -y apt-cacher-ng
RUN apt-get -q update && apt-get -q install -y apt-cacher-ng

EXPOSE 3142
CMD chmod 777 /var/cache/apt-cacher-ng && /etc/init.d/apt-cacher-ng start && tail -f /var/log/apt-cacher-ng/*
Expand Down
6 changes: 3 additions & 3 deletions cache/Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ Vagrant.configure("2") do |config|
end

config.vm.provision "shell", inline: <<-SHELL
DEBIAN_FRONTEND=noninteractive apt-get update
DEBIAN_FRONTEND=noninteractive apt-get upgrade -y
DEBIAN_FRONTEND=noninteractive apt-get install apt-cacher-ng
DEBIAN_FRONTEND=noninteractive apt-get -q update
DEBIAN_FRONTEND=noninteractive apt-get -q upgrade -y
DEBIAN_FRONTEND=noninteractive apt-get -q -y install apt-cacher-ng

if [ -f /home/vagrant/apt-cacher-ng.tgz ]; then
cd /var/cache
Expand Down
2 changes: 1 addition & 1 deletion http/hyperv/packages.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Additional packages for Hyper-V
d-i pkgsel/include string openssh-server ntp curl net-tools dnsutils linux-tools-$(uname -r) linux-cloud-tools-$(uname -r) linux-cloud-tools-common cifs-utils

d-i preseed/late_command string in-target apt-get install -y --install-recommends linux-virtual-lts-xenial linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial;
d-i preseed/late_command string in-target apt-get -q install -y --install-recommends linux-virtual-lts-xenial linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial;
d-i grub-installer/force-efi-extra-removable boolean true

# Change boot
Expand Down
2 changes: 1 addition & 1 deletion provisioning/en/provisioner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ else
echo "Installing $CMD ..."
echo >> /etc/apt/sources.list
echo "deb http://deb.subutai.io/subutai $ENV main" | tee --append /etc/apt/sources.list
DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install subutai
DEBIAN_FRONTEND=noninteractive apt-get -q update && DEBIAN_FRONTEND=noninteractive apt-get -q -y install subutai
cmd_path="$(which $CMD)"
fi

Expand Down
6 changes: 3 additions & 3 deletions scripts/apt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/bin/bash

echo Updating from repositories ...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y update
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y update

echo Upgrading distribution ...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y dist-upgrade

echo Adding needed packages ...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install net-tools inotify-tools
sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install net-tools inotify-tools



4 changes: 2 additions & 2 deletions scripts/cleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ -z "$BRANCHTAG" ]; then
exit -1
fi

DEBIAN_FRONTEND=noninteractive apt-get -y autoremove
DEBIAN_FRONTEND=noninteractive apt-get -q -y autoremove

# seems this is removing everything we install
#sudo dpkg -l 'linux-*' | sed '/^ii/!d;/'"$(uname -r | sed "s/\(.*\)-\([^0-9]\+\)/\1/")"'/d;s/^[^ ]* [^ ]* \([^ ]*\).*/\1/;/[0-9]/!d' | xargs sudo DEBIAN_FRONTEND=noninteractive apt-get -y purge
Expand All @@ -20,7 +20,7 @@ fi

echo "Replacing /etc/apt/sources.list with standard sources"
cp /tmp/sources.list /etc/apt/sources.list
DEBIAN_FRONTEND=noninteractive apt-get update
DEBIAN_FRONTEND=noninteractive apt-get -q update

echo "Setting ulimit -n 65535 in /etc/profile"
sed -i '1 i\ulimit -n 65535' /etc/profile
2 changes: 1 addition & 1 deletion scripts/debian/vmware.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh -eux

# install open-vm-tools
DEBIAN_FRONTEND=noninteractive apt-get install -y open-vm-tools;
DEBIAN_FRONTEND=noninteractive apt-get -q install -y open-vm-tools;

# set a default HOME_DIR environment variable if not set
HOME_DIR="${HOME_DIR:-/home/subutai}";
Expand Down
2 changes: 1 addition & 1 deletion scripts/ubuntu/vmware.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh -eux

DEBIAN_FRONTEND=noninteractive apt-get install -y open-vm-tools;
DEBIAN_FRONTEND=noninteractive apt-get -q install -y open-vm-tools;
mkdir /mnt/hgfs;
echo "platform specific vmware.sh executed";
6 changes: 2 additions & 4 deletions scripts/ubuntu/zfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash

DEBIAN_FRONTEND=noninteractive apt-get -y install zfsutils-linux
DEBIAN_FRONTEND=noninteractive apt-get -q -y install zfsutils-linux

/sbin/modprobe zfs

Expand All @@ -10,9 +10,7 @@ zfs create -o mountpoint="/var/lib/lxc" subutai/fs

zpool set autoexpand=on subutai

DEBIAN_FRONTEND=noninteractive apt-get -y install lxc

DEBIAN_FRONTEND=noninteractive apt-get -y install dirmngr
DEBIAN_FRONTEND=noninteractive apt-get -q -y install lxc dirmngr

apt-key adv --recv-keys --keyserver keyserver.ubuntu.com C6B2AC7FBEB649F1

3 changes: 1 addition & 2 deletions scripts/vbox.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
echo "==> Installing VirtualBox guest additions"

# Assuming the following packages are installed
DEBIAN_FRONTEND=noninteractive apt-get install -y linux-headers-$(uname -r) build-essential perl
DEBIAN_FRONTEND=noninteractive apt-get install -y dkms
DEBIAN_FRONTEND=noninteractive apt-get -q install -y linux-headers-$(uname -r) build-essential perl dkms

VBOX_VERSION=$(cat /home/${SSH_USERNAME}/.vbox_version)
mount -o loop /home/${SSH_USERNAME}/VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
Expand Down
6 changes: 2 additions & 4 deletions scripts/zfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

DEBIAN_FRONTEND=noninteractive apt-get -y install zfsutils
DEBIAN_FRONTEND=noninteractive apt-get -q -y install zfsutils

/sbin/modprobe zfs

Expand All @@ -10,9 +10,7 @@ zfs create -o mountpoint="/var/lib/lxc" subutai/fs

zpool set autoexpand=on subutai

DEBIAN_FRONTEND=noninteractive apt-get -y install lxc

DEBIAN_FRONTEND=noninteractive apt-get -y install dirmngr
DEBIAN_FRONTEND=noninteractive apt-get -q -y install lxc dirmngr

apt-key adv --recv-keys --keyserver keyserver.ubuntu.com C6B2AC7FBEB649F1

18 changes: 9 additions & 9 deletions xenial/hyperv/provisioner.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@
"echo 'subutai ALL=NOPASSWD: ALL' >> /etc/sudoers",
"date > /home/{{user `ssh_username`}}/vagrant_box_build_time",
"echo Updating from repositories ...",
"DEBIAN_FRONTEND=noninteractive apt-get -y update",
"DEBIAN_FRONTEND=noninteractive apt-get -q -y update",
"echo Upgrading distribution ...",
"DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade",
"DEBIAN_FRONTEND=noninteractive apt-get -q -y dist-upgrade",
"echo Adding needed packages ...",
"DEBIAN_FRONTEND=noninteractive apt-get -y install net-tools inotify-tools",
"DEBIAN_FRONTEND=noninteractive apt-get -y install linux-cloud-tools-$(uname -r)",
"DEBIAN_FRONTEND=noninteractive apt-get -y install linux-virtual-lts-xenial linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial",
"DEBIAN_FRONTEND=noninteractive apt-get -q -y install net-tools inotify-tools",
"DEBIAN_FRONTEND=noninteractive apt-get -q -y install linux-cloud-tools-$(uname -r)",
"DEBIAN_FRONTEND=noninteractive apt-get -q -y install linux-virtual-lts-xenial linux-tools-virtual-lts-xenial linux-cloud-tools-virtual-lts-xenial",
"echo \"{{user `ssh_username`}} ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers.d/{{user `ssh_username`}}",
"chmod 440 /etc/sudoers.d/{{user `ssh_username`}}",
"mkdir -pm 700 /home/{{user `ssh_username`}}/.ssh",
"wget --no-check-certificate https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub -O /home/{{user `ssh_username`}}/.ssh/authorized_keys",
"chmod 0600 /home/{{user `ssh_username`}}/.ssh/authorized_keys",
"chown -R {{user `ssh_username`}}:{{user `ssh_username`}} /home/{{user `ssh_username`}}/.ssh",
"cp /tmp/sources.list /etc/apt/sources.list",
"DEBIAN_FRONTEND=noninteractive apt-get update",
"DEBIAN_FRONTEND=noninteractive apt-get -q update",
"sed -i '1 i\\ulimit -n 65535' /etc/profile",
"DEBIAN_FRONTEND=noninteractive apt-get -y install zfsutils-linux",
"DEBIAN_FRONTEND=noninteractive apt-get -q -y install zfsutils-linux",
"/sbin/modprobe zfs",
"zpool create -f subutai /dev/mapper/main-zfs",
"zfs create -o mountpoint=\"/var/lib/lxc\" subutai/fs",
"zpool set autoexpand=on subutai",
"DEBIAN_FRONTEND=noninteractive apt-get -y install lxc",
"DEBIAN_FRONTEND=noninteractive apt-get -y install dirmngr",
"DEBIAN_FRONTEND=noninteractive apt-get -q -y install lxc",
"DEBIAN_FRONTEND=noninteractive apt-get -q -y install dirmngr",
"apt-key adv --recv-keys --keyserver keyserver.ubuntu.com C6B2AC7FBEB649F1"
]
}