aboutsummaryrefslogtreecommitdiffstats
path: root/Vagrantfile
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-07-16 09:20:34 +0100
committerskullydazed <skullydazed@users.noreply.github.com>2019-07-16 01:20:34 -0700
commit29e9caa82bdfe898dd7fca82fcecf0cae2374859 (patch)
treead65f691513580f926465959b5a1169365c77959 /Vagrantfile
parenta32f7e1a25a8a200d838aa8256ffe39708fbd723 (diff)
downloadfirmware-29e9caa82bdfe898dd7fca82fcecf0cae2374859.tar.gz
firmware-29e9caa82bdfe898dd7fca82fcecf0cae2374859.tar.bz2
firmware-29e9caa82bdfe898dd7fca82fcecf0cae2374859.zip
Configure Vagrant to use qmk_base_container (#6194)
* Initial conversion of vagrant to use qmkfm/base_container * Fix vagrant when using docker provider * Workaround for VirtualBox VM restarts * Generalise Vagrant docs slightly and add FAQ
Diffstat (limited to 'Vagrantfile')
-rw-r--r--Vagrantfile31
1 files changed, 21 insertions, 10 deletions
diff --git a/Vagrantfile b/Vagrantfile
index 552711d63..dae4e0d53 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -52,26 +52,37 @@ Vagrant.configure(2) do |config|
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
+ # config.vm.box is nil. In this case, we adhoc build util/vagrant/Dockerfile.
+ # 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.build_dir = "util/vagrant"
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"
+ # Unless we are running the docker container directly
+ # 1. run container detached on vm
+ # 2. attach on 'vagrant ssh'
+ ["virtualbox", "vmware_workstation", "vmware_fusion"].each do |type|
+ config.vm.provider type do |virt, override|
+ override.vm.provision "docker" do |d|
+ d.run "qmkfm/base_container",
+ cmd: "tail -f /dev/null",
+ args: "--privileged -v /dev:/dev -v '/vagrant:/vagrant'"
+ end
+
+ override.vm.provision "shell", inline: <<-SHELL
+ echo 'docker restart qmkfm-base_container && exec docker exec -it qmkfm-base_container /bin/bash -l' >> ~vagrant/.bashrc
+ SHELL
+ end
+ end
config.vm.post_up_message = <<-EOT
- Log into the VM using 'vagrant ssh'. QMK directory synchronized with host is
- located at /vagrant
+ Log into the environment 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