diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2018-08-30 21:37:07 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-08-31 05:52:22 +0000 |
| commit | a1fe8fe0661ebacb8f51a2ae7e7d6ecfcd8db1a8 (patch) | |
| tree | 65eb86a9c7b0f25a1a7f3fb02e5f3c587ffefb8e /Vagrantfile | |
| parent | f2c74b7dbd4201e355efe0221ce8a5a7228d7cea (diff) | |
vagrant: Add fedora box
Change-Id: Ic33f3f5ee7e45d60f0eb7f50b94c919091fc3787
Reviewed-on: https://code.wireshark.org/review/29357
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/Vagrantfile b/Vagrantfile index c3d74bdaa2..2f38d0e192 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,9 +6,6 @@ VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - # Base box is Ubuntu 16.04 - config.vm.box = "ubuntu/xenial64" - # Bump the default resources as building is expensive config.vm.provider "virtualbox" do |v| v.memory = 2048 @@ -19,9 +16,23 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.ssh.forward_x11 = true # Install and build the various things (including wireshark!) - config.vm.provision "shell" do |s| - s.path = 'tools/debian-setup.sh' - s.args = ['--install-optional', '--assume-yes'] + config.vm.define "ubuntu", autostart: false do |deb| + deb.vm.box = "ubuntu/xenial64" + + deb.vm.provision "shell" do |s| + s.path = 'tools/debian-setup.sh' + s.args = ['--install-optional', '--assume-yes'] + end + deb.vm.provision :shell, path: 'vagrant_build.sh', privileged: false + end + + config.vm.define "fedora", autostart: false do |rpm| + rpm.vm.box = "fedora/28-cloud-base" + + rpm.vm.provision "shell" do |s| + s.path = 'tools/rpm-setup.sh' + s.args = ['--install-optional', '--assumeyes'] + end + rpm.vm.provision :shell, path: 'vagrant_build.sh', privileged: false end - config.vm.provision :shell, path: 'vagrant_build.sh', privileged: false end |