From 1203146ab9fa7b976503bdd75c3c919c38018f8f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 12 Mar 2019 21:26:07 -0400 Subject: [PATCH 1/2] feat: switch vagrant vm to ubuntu 18.04 --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 676c3ea62..b9a1d33c9 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,7 +1,7 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-14.04" +BOX_NAME = ENV["BOX_NAME"] || "bento/ubuntu-18.04" BOX_CPUS = ENV["BOX_CPUS"] || "1" BOX_MEMORY = ENV["BOX_MEMORY"] || "1024" DOKKU_DOMAIN = ENV["DOKKU_DOMAIN"] || "dokku.me" From 50357eb6829f8d7690fb06ee8708f4c36c2ad940 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 12 Mar 2019 21:26:39 -0400 Subject: [PATCH 2/2] feat: add support for new vmware_desktop provider --- Vagrantfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index b9a1d33c9..fdae6d9b0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -33,6 +33,10 @@ Vagrant::configure("2") do |config| v.vmx["memsize"] = BOX_MEMORY end + config.vm.provider :vmware_desktop do |v, override| + v.vmx["memsize"] = BOX_MEMORY + end + config.vm.define "empty", autostart: false config.vm.define "dokku", primary: true do |vm|