X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Vagrantfile;h=552711d632f1114deb393c8bc9b986a1091f1bf2;hb=3538955778c253e68779605cc67c27e15d195729;hp=788e014def4b11e1de77802ba21e160e77944e49;hpb=ee424f86081c538fc74c3e9b50c7b1eb595b6e58;p=qmk_firmware.git

diff --git a/Vagrantfile b/Vagrantfile
index 788e014de..552711d63 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,69 +1,84 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure(2) do |config|
-  # You can only have one config.vm.box uncommented at a time
-
-  # Comment this and uncomment another if you don't want to use the minimal Arch box
-  config.vm.box = "dragon788/arch-ala-elasticdog"
-
-  # VMware/Virtualbox 64 bit
-  # config.vm.box = "phusion/ubuntu-14.04-amd64"
-  #
-  # VMware/Virtualbox 64 bit
-  # config.vm.box = "puphpet/centos65-x64"
-  #
-  # VMware/Virtualbox 64 bit
-  # config.vm.box = "bento/opensuse-13.2-x86_64"
-  #
-  # Virtualbox only
-  # config.vm.box = "bento/opensuse-13.2-i386"
-  # config.vm.box = ""
-  # config.vm.box = ""
-
-  # This section allows you to customize the Virtualbox VM
-  # settings, ie showing the GUI or upping the memory
-  # or cores if desired
-  config.vm.provider "virtualbox" do |vb|
-    # Hide the VirtualBox GUI when booting the machine
-    vb.gui = false
-  
-    # Customize the amount of memory on the VM:
-    vb.memory = "512"
-  end
-
-  # This section allows you to customize the VMware VM
-  # settings, ie showing the GUI or upping the memory
-  # or cores if desired
-  config.vm.provider "vmware" do |vmw|
-    # Hide the VMware GUI when booting the machine
-    vmw.gui = false
- 
-    # Customize the amount of memory on the VM:
-    vmw.memory = "512"
-  end
-
-  # This script ensures the required packages for AVR programming are installed
-  # It also ensures the system always gets the latest updates when powered on
-  # If this causes issues you can run a 'vagrant destroy' and then
-  # add a # before ,args: and run 'vagrant up' to get a working
-  # non-updated box and then attempt to troubleshoot or open a Github issue 
-  
-  config.vm.provision "shell", run: "always", path: "avr_setup.sh", args: "-update"
-
-  config.vm.post_up_message = """
-  Log into the VM using 'vagrant ssh' on OSX or from Git Bash (Win)
-  or 'vagrant ssh-config' and Putty or another SSH tool
-
-  Change directory to the keyboard you wish to program 
-  optionally and modify your layout, 
-  then run 'make clean' 
-  and then 'make' to compile the .eep and .hex files.
-
-  Or you can copy and paste the line below. 
- 
-  cd /vagrant; cd keyboard; cd ergodox_ez; make clean; make
-  
-
-  """
-end
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure(2) do |config|
+  # define a name instead of just 'default'
+  config.vm.define "qmk_firmware"
+
+  # VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit
+  config.vm.box = "generic/debian9"
+  
+  config.vm.synced_folder '.', '/vagrant'
+
+  # This section allows you to customize the Virtualbox VM
+  # settings, ie showing the GUI or upping the memory
+  # or cores if desired
+  config.vm.provider "virtualbox" do |vb|
+    # Hide the VirtualBox GUI when booting the machine
+    vb.gui = false
+    # Uncomment the below lines if you want to program
+    # your Teensy via the VM rather than your host OS
+    #vb.customize ['modifyvm', :id, '--usb', 'on']
+    #vb.customize ['usbfilter', 'add', '0',
+    #         '--target', :id,
+    #         '--name', 'teensy',
+    #         '--vendorid', '0x16c0',
+    #         '--productid','0x0478'
+    #        ]
+    # Customize the amount of memory on the VM:
+    vb.memory = "512"
+    # Uncomment the below lines if you have time sync
+    # issues with make and incremental builds
+    #vb.customize [ "guestproperty", "set", :id, "/VirtualBox/GuestAdd/VBoxService/--timesync-set-threshold", 1000 ]
+  end
+
+  # This section allows you to customize the VMware VM
+  # settings, ie showing the GUI or upping the memory
+  # or cores if desired
+  config.vm.provider "vmware_workstation" do |vmw|
+    # Hide the VMware GUI when booting the machine
+    vmw.gui = false
+
+    # Customize the amount of memory on the VM:
+    vmw.memory = "512"
+  end
+
+  config.vm.provider "vmware_fusion" do |vmf|
+    # Hide the vmfare GUI when booting the machine
+    vmf.gui = false
+
+    # Customize the amount of memory on the VM:
+    vmf.memory = "512"
+  end
+
+  # Docker provider pulls from hub.docker.com respecting docker.image if
+  # config.vm.box is nil. Note that this bind-mounts from the current dir to
+  # /vagrant in the guest, so unless your UID is 1000 to match vagrant in the
+  # image, you'll need to: chmod -R a+rw .
+  config.vm.provider "docker" do |docker, override|
+    override.vm.box = nil
+    docker.image = "jesselang/debian-vagrant:stretch"
+    docker.has_ssh = true
+  end
+
+  # This script ensures the required packages for AVR programming are installed
+  # It also ensures the system always gets the latest updates when powered on
+  # If this causes issues you can run a 'vagrant destroy' and then
+  # add a # before ,run: (or change "always" to "once") and run 'vagrant up' to get a working
+  # non-updated box and then attempt to troubleshoot or open a Github issue
+  config.vm.provision "shell", inline: "/vagrant/util/qmk_install.sh", run: "always"
+
+  config.vm.post_up_message = <<-EOT
+
+  Log into the VM using 'vagrant ssh'. QMK directory synchronized with host is
+  located at /vagrant
+  To compile the .hex files use make command inside this directory, e.g.
+     cd /vagrant
+     make <keyboard>:default
+
+  Examples:
+     make planck/rev4:default:dfu
+     make planck:default
+
+  EOT
+end