From 8dc036c2e49f51a8dc1721ac8e84d7ec1c873f1e Mon Sep 17 00:00:00 2001 From: Jean-Sebastien Paquet Date: Sat, 19 Jun 2021 08:52:34 -0400 Subject: Upgrades Vagrant box to Debian 10 to fix Docker build error on Debian 9. (#13236) --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile index adb93a3cee..8125b05890 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -6,7 +6,7 @@ Vagrant.configure(2) do |config| config.vm.define "qmk_firmware" # VMware/Virtualbox ( and also Hyperv/Parallels) 64 bit - config.vm.box = "generic/debian9" + config.vm.box = "generic/debian10" config.vm.synced_folder '.', '/vagrant' -- cgit v1.2.3 From b705020dafd0aa7531d03cd8fa64260684a3fb79 Mon Sep 17 00:00:00 2001 From: Zach White Date: Sun, 29 Aug 2021 16:41:56 -0700 Subject: move everything from qmkfm/base_container to qmkfm/qmk_cli (#14230) --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Vagrantfile') diff --git a/Vagrantfile b/Vagrantfile index 8125b05890..717f4ec98b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -68,13 +68,13 @@ Vagrant.configure(2) do |config| ["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", + d.run "qmkfm/qmk_cli", 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 + echo 'docker restart qmkfm-qmk_cli && exec docker exec -it qmkfm-qmk_cli /bin/bash -l' >> ~vagrant/.bashrc SHELL end end -- cgit v1.2.3