Merge remote-tracking branch 'origin/stable' into stable

vagrant/lib/tails_build_settings.rb

@@ -5,14 +5,18 @@
 # Hostname of the virtual machine (must be in /etc/hosts)
 VIRTUAL_MACHINE_HOSTNAME = 'vagrant-stretch'
 
+# Approximate amount of RAM needed to run the builder's base system
+# and perform a build
+VM_MEMORY_BASE = 1024
+
 # Approximate amount of extra space needed for builds
-BUILD_SPACE_REQUIREMENT = 12.25*1024
+BUILD_SPACE_REQUIREMENT = 12*1024
 
 # Virtual machine memory size for on-disk builds
-VM_MEMORY_FOR_DISK_BUILDS = 768
+VM_MEMORY_FOR_DISK_BUILDS = VM_MEMORY_BASE
 
 # Virtual machine memory size for in-memory builds
-VM_MEMORY_FOR_RAM_BUILDS = VM_MEMORY_FOR_DISK_BUILDS + BUILD_SPACE_REQUIREMENT
+VM_MEMORY_FOR_RAM_BUILDS = VM_MEMORY_BASE + BUILD_SPACE_REQUIREMENT
 
 # The builder VM's platform
 ARCHITECTURE = "amd64"