mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 07:22:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Patrick Connolly 2014-08-27 11:35:31 -03:00
parent 5822df9231
commit c08d2092f6
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/fdroid.texi
View file

@ -113,8 +113,7 @@ VirtualBox (debian package virtualbox)
@item @item
Ruby (debian packages ruby and rubygems) Ruby (debian packages ruby and rubygems)
@item @item
Vagrant (unpackaged) Be sure to use 1.3.x because 1.4.x is completely broken Vagrant (unpackaged, tested on v1.4.3)
(at the time of writing, the forthcoming 1.4.3 might work)
@item @item
Paramiko (debian package python-paramiko) Paramiko (debian package python-paramiko)
@item @item

6
makebuildserver
View file

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