From dc2f53b48c854b40204ff9fbc3cd99381ec4a79c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 30 Aug 2016 21:23:40 +0200 Subject: [PATCH] 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. --- buildserver/Vagrantfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile index e586e05c..a7b1745f 100644 --- a/buildserver/Vagrantfile +++ b/buildserver/Vagrantfile @@ -4,7 +4,8 @@ configfile = YAML.load_file('Vagrantfile.yaml') 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.auto_detect = false config.cache.enable :apt