Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit 1f41691

Browse files
committed
Use official Ubuntu Vagrant boxes
1 parent 82671cb commit 1f41691

3 files changed

Lines changed: 22 additions & 12 deletions

File tree

release/x86-linux/Vagrantfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Vagrant.configure(2) do |config|
1313
# Every Vagrant development environment requires a box. You can search for
1414
# boxes at https://atlas.hashicorp.com/search.
1515
# https://atlas.hashicorp.com/boxcutter/boxes/debian80-i386
16-
config.vm.box = "boxcutter/debian80-i386"
16+
config.vm.box = "ubuntu/trusty32"
1717

1818
# Disable automatic box update checking. If you disable this, then
1919
# boxes will only be checked for updates when the user runs
@@ -61,6 +61,11 @@ Vagrant.configure(2) do |config|
6161
# config.push.define "atlas" do |push|
6262
# push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
6363
# end
64+
config.vm.provider :virtualbox do |vb|
65+
vb.customize ["modifyvm", :id, "--hwvirtex", "on"]
66+
vb.customize ["modifyvm", :id, "--audio", "none"]
67+
vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
68+
end
6469

6570
# Enable provisioning with a shell script. Additional provisioners such as
6671
# Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
@@ -72,4 +77,5 @@ Vagrant.configure(2) do |config|
7277
sudo update-alternatives --config gcc
7378
gem install bundler
7479
SHELL
80+
7581
end

release/x86_64-freebsd10/Vagrantfile

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,15 @@ Vagrant.configure(2) do |config|
5656
#
5757
# View the documentation for the provider you are using for more
5858
# information on available options.
59+
# Various settings as suggested by the FreeBSD community
60+
config.ssh.shell = "sh"
61+
config.vm.base_mac = "080027D14C66"
62+
config.vm.provider :virtualbox do |vb|
63+
vb.customize ["modifyvm", :id, "--hwvirtex", "on"]
64+
vb.customize ["modifyvm", :id, "--audio", "none"]
65+
vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
66+
vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
67+
end
5968

6069
# Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
6170
# such as FTP and Heroku are also available. See the documentation at
@@ -74,14 +83,4 @@ Vagrant.configure(2) do |config|
7483
config.vm.provision "shell", inline: <<-SHELL
7584
pkg install -y gmake ruby rubygem-bundler git-subversion python2
7685
SHELL
77-
78-
# Various settings as suggested by the FreeBSD community
79-
config.ssh.shell = "sh"
80-
config.vm.base_mac = "080027D14C66"
81-
config.vm.provider :virtualbox do |vb|
82-
vb.customize ["modifyvm", :id, "--hwvirtex", "on"]
83-
vb.customize ["modifyvm", :id, "--audio", "none"]
84-
vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
85-
vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
86-
end
8786
end

release/x86_64-linux/Vagrantfile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Vagrant.configure(2) do |config|
1313
# Every Vagrant development environment requires a box. You can search for
1414
# boxes at https://atlas.hashicorp.com/search.
1515
# https://atlas.hashicorp.com/quarkslab/boxes/debian-8.0-amd64
16-
config.vm.box = "quarkslab/debian-8.0-amd64"
16+
config.vm.box = "ubuntu/trusty64"
1717

1818
# Disable automatic box update checking. If you disable this, then
1919
# boxes will only be checked for updates when the user runs
@@ -54,6 +54,11 @@ Vagrant.configure(2) do |config|
5454
#
5555
# View the documentation for the provider you are using for more
5656
# information on available options.
57+
config.vm.provider :virtualbox do |vb|
58+
vb.customize ["modifyvm", :id, "--hwvirtex", "on"]
59+
vb.customize ["modifyvm", :id, "--audio", "none"]
60+
vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
61+
end
5762

5863
# Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
5964
# such as FTP and Heroku are also available. See the documentation at

0 commit comments

Comments
 (0)