Commit 5577827d authored by Tails developers's avatar Tails developers

Merge branch 'bugfix/7644-remove-mounted-image-from-vagrant-build-box' into stable

parents 1fc7eb9d f8afa2e3
......@@ -32,8 +32,8 @@ cpus = ENV['TAILS_BUILD_CPUS']
if vagrant_old
Vagrant::Config.run do |config|
config.vm.box = 'tails-builder-20140709'
config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-20140709.box'
config.vm.box = 'tails-builder-20141201'
config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-20141201.box'
config.vm.provision :shell, :inline => "http_proxy='#{ENV['http_proxy']}' /vagrant/provision/setup-tails-builder"
......@@ -44,8 +44,8 @@ if vagrant_old
end
else
Vagrant.configure("2") do |config|
config.vm.box = 'tails-builder-20140709'
config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-20140709.box'
config.vm.box = 'tails-builder-20141201'
config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/tails-builder-20141201.box'
config.vm.provision "shell",
inline: "sudo http_proxy='#{ENV['http_proxy']}' /vagrant/provision/setup-tails-builder"
......
......@@ -15,4 +15,4 @@ VM_MEMORY_FOR_DISK_BUILDS = 512
VM_MEMORY_FOR_RAM_BUILDS = VM_MEMORY_FOR_DISK_BUILDS + BUILD_SPACE_REQUIREMENT
# Checksum for BOX
BOX_CHECKSUM = '9a51f600f015d107a249f2530c5681d0f475525f52698404d5ce2fe11a0e07e3'
BOX_CHECKSUM = 'efb339f06192d5db16585abc946e50cc73cb13aad5afd39357c6a8e33aebb814'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment