kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-10-03 17:50:11 +02:00
Code Activity

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
Show Stats 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
Ruby (debian packages ruby and rubygems)
@item
Vagrant (unpackaged) Be sure to use 1.3.x because 1.4.x is completely broken
(at the time of writing, the forthcoming 1.4.3 might work)
Vagrant (unpackaged, tested on v1.4.3)
@item
Paramiko (debian package python-paramiko)
@item

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'])