From: Marcus <bubuiic@aol.com>
Date: Wed, 25 Oct 2017 12:41:25 +0000 (+0000)
Subject: Merge branch 'makebuildserver/default_memory' into 'master'
X-Git-Tag: 0.9~47
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=fde964479d0f7405818cd34b993482b8057447b6;hp=23265e3290eec309dbc3f05a7ea306ee1a3ac365;p=fdroidserver.git

Merge branch 'makebuildserver/default_memory' into 'master'

makebuildserver: change mem default 4 GB

See merge request fdroid/fdroidserver!358
---

diff --git a/examples/makebuildserver.config.py b/examples/makebuildserver.config.py
index 7015cf58..3c243899 100644
--- a/examples/makebuildserver.config.py
+++ b/examples/makebuildserver.config.py
@@ -44,7 +44,7 @@
 #
 # debian_mirror = 'http://ftp.uk.debian.org/debian/'
 
-# The amount of RAM the build server will have (default: 1024)
+# The amount of RAM the build server will have (default: 2048)
 # memory = 3584
 
 # The number of CPUs the build server will have
diff --git a/makebuildserver b/makebuildserver
index 27a952b8..64280c35 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -66,7 +66,7 @@ config = {
     'boot_timeout': 600,
     'cachedir': cachedir,
     'cpus': 1,
-    'memory': 1024,
+    'memory': 2048,
     'hwvirtex': 'off',
     'vm_provider': 'virtualbox',
 }