Debian: added configurable VAGRANTBOX env variable.
This should make it easy to build in different virtual
machines, e.g. 32-bit.
commit51195b30dc34eeb31ad0fc6df5240cd38f413bc2
authorJohn MacFarlane <jgm@berkeley.edu>
dateThu 12 Nov 2015, 17:26 (11 years ago)
parent0fd1381
deb/Makefile+2−1
@@ -1,9 +1,10 @@
11COMMIT?=HEAD
2+VAGRANTBOX?=ubuntu/trusty64
23
34.PHONY: package clean
45
56package:
6− vagrant up
7+ VAGRANTBOX=$(VAGRANTBOX) vagrant up
78 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/'
89 vagrant halt
910
deb/Vagrantfile+1−1
@@ -12,7 +12,7 @@ Vagrant.configure(2) do |config|
1212
1313 # Every Vagrant development environment requires a box. You can search for
1414 # boxes at https://atlas.hashicorp.com/search.
15− config.vm.box = "ubuntu/trusty64"
15+ config.vm.box = ENV['VAGRANTBOX'] || "ubuntu/trusty64"
1616
1717 # Disable automatic box update checking. If you disable this, then
1818 # boxes will only be checked for updates when the user runs