mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'update-vagrantfile' into 'master'

Browse source 
Update Vagrantfile and docs to clarify v1.4.3 is ok

Saw in the server docs that we were recommending 1.3.x and saying 1.4.x was broken. I've confirmed that 1.4.x works, and updated things accordingly. Higher version might work, but figured minimal change to build stuff was best :)

See merge request !24
This commit is contained in:
Ciaran Gultnieks 2014-11-07 14:44:58 +00:00
commit 05c2d18709
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
makebuildserver
View file

@ -147,12 +147,14 @@ for f, src, shasum in cachefiles:
# Generate an appropriate Vagrantfile for the buildserver, based on our
# settings...
vagrantfile = """
Vagrant::Config.run do |config|
Vagrant.configure("2") do |config|
config.vm.box = "{0}"
config.vm.box_url = "{1}"
config.vm.customize ["modifyvm", :id, "--memory", "{2}"]
config.vm.provider "virtualbox" do |v|
v.customize ["modifyvm", :id, "--memory", "{2}"]
end
config.vm.provision :shell, :path => "fixpaths.sh"
""".format(config['basebox'], config['baseboxurl'], config['memory'])