diff options
| author | Geir Storli <geirst@oath.com> | 2017-10-04 14:33:45 +0200 |
|---|---|---|
| committer | Geir Storli <geirst@oath.com> | 2017-10-04 14:33:45 +0200 |
| commit | f1a0d47ae4945a37f22219347825fc5d22cd6678 (patch) | |
| tree | 7925c9068f2c888fbd62f7eaa4666c38fd93b446 /vagrant | |
| parent | c110e9aff4234599725eb3229207fd9a0c330a55 (diff) | |
Update with new centos, clion and align some settings to match build env.
Diffstat (limited to 'vagrant')
| -rw-r--r-- | vagrant/Vagrantfile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 74b2f5bdbdb..a06f5afbd49 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -4,7 +4,7 @@ # For a complete reference, please see the online documentation at https://docs.vagrantup.com. Vagrant.configure("2") do |config| - config.vm.box = "boxcutter/centos73-desktop" + config.vm.box = "boxcutter/centos7-desktop" config.ssh.forward_agent = true @@ -16,7 +16,7 @@ Vagrant.configure("2") do |config| vb.name = "vespa-dev" vb.memory = "8192" - vb.cpus = 8 + vb.cpus = 4 end # Install required and nice-to-have packages @@ -27,6 +27,7 @@ Vagrant.configure("2") do |config| yum -y install yum-utils yum -y install git \ ccache \ + maven \ rpm-build \ valgrind \ sudo \ @@ -35,7 +36,8 @@ Vagrant.configure("2") do |config| yum-builddep -y /vagrant/dist/vespa.spec echo -e "* soft nproc 409600\n* hard nproc 409600" > /etc/security/limits.d/99-nproc.conf echo -e "* soft nofile 262144\n* hard nofile 262144" > /etc/security/limits.d/99-nofile.conf - wget -q -O - https://download.jetbrains.com/cpp/CLion-2017.2.2.tar.gz | tar -C /opt -zx - ln -sf /opt/clion-2017.2.2/bin/clion.sh /usr/bin/clion + echo -e "fs.inotify.max_user_watches = 524288" > /etc/sysctl.d/clion.conf + wget -q -O - https://download.jetbrains.com/cpp/CLion-2017.2.3.tar.gz | tar -C /opt -zx + ln -sf /opt/clion-2017.2.3/bin/clion.sh /usr/bin/clion SHELL end |