aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deb/Makefile3
-rw-r--r--deb/Vagrantfile2
2 files changed, 3 insertions, 2 deletions
diff --git a/deb/Makefile b/deb/Makefile
index 7f514fe24..207de6895 100644
--- a/deb/Makefile
+++ b/deb/Makefile
@@ -1,9 +1,10 @@
COMMIT?=HEAD
+VAGRANTBOX?=ubuntu/trusty64
.PHONY: package clean
package:
- vagrant up
+ VAGRANTBOX=$(VAGRANTBOX) vagrant up
vagrant ssh -c 'rm -rf pandoc && git clone https://github.com/jgm/pandoc && cd pandoc && git checkout -b work $(COMMIT) && git submodule update --init && ./make_deb.sh && cp *.deb /vagrant_data/'
vagrant halt
diff --git a/deb/Vagrantfile b/deb/Vagrantfile
index f52de8ff9..a2a288ffe 100644
--- a/deb/Vagrantfile
+++ b/deb/Vagrantfile
@@ -12,7 +12,7 @@ Vagrant.configure(2) do |config|
# Every Vagrant development environment requires a box. You can search for
# boxes at https://atlas.hashicorp.com/search.
- config.vm.box = "ubuntu/trusty64"
+ config.vm.box = ENV['VAGRANTBOX'] || "ubuntu/trusty64"
# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs