mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
buildserver: vagrant-cachier conflicts with custom apt cache
The technique where /var/cache/apt is mounted as a shared folder conflicts with vagrant-cachier's workings. Therefore, ignore vagrant-cachier if the user selects ./makebuildserver's custom apt cache. The shared folder way has the advantage for CI builds of storing the cache outside of VAGRANT_HOME, which is set to be in the git project. That gets wiped by `git clean -fdx` on each CI build.
This commit is contained in:
parent
34f451361f
commit
dc2f53b48c
3
buildserver/Vagrantfile
vendored
3
buildserver/Vagrantfile
vendored
@ -4,7 +4,8 @@ configfile = YAML.load_file('Vagrantfile.yaml')
|
|||||||
|
|
||||||
Vagrant.configure("2") do |config|
|
Vagrant.configure("2") do |config|
|
||||||
|
|
||||||
if Vagrant.has_plugin?("vagrant-cachier")
|
# these two caching methods conflict, so only use one at a time
|
||||||
|
if Vagrant.has_plugin?("vagrant-cachier") and not configfile.has_key? "aptcachedir"
|
||||||
config.cache.scope = :box
|
config.cache.scope = :box
|
||||||
config.cache.auto_detect = false
|
config.cache.auto_detect = false
|
||||||
config.cache.enable :apt
|
config.cache.enable :apt
|
||||||
|
Loading…
Reference in New Issue
Block a user