From e43c3a05d97a60700b53dc3d6b5919d375514082 Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Wed, 10 Jul 2024 16:35:13 +0100 Subject: [PATCH 1/2] Improve docker/parallels detection --- Vagrantfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 6b405c9e4..8c554b4dc 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -42,17 +42,13 @@ end def vvv_is_docker_present() - VagrantPlugins::DockerProvider::Driver.new.execute("docker", "version") - return true -rescue Vagrant::Errors::CommandUnavailable - return false + if system("docker version") + return true + end end def vvv_is_parallels_present() - VagrantPlugins::DockerProvider::Driver.new.execute("prctl", "version") - return true -rescue Vagrant::Errors::CommandUnavailable - return false + return Vagrant.has_plugin?("vagrant-parallels") end vagrant_dir = __dir__ From e10bc480339fe5ffb3a8893a5c89e3260131853a Mon Sep 17 00:00:00 2001 From: Tom J Nowell Date: Wed, 10 Jul 2024 16:45:48 +0100 Subject: [PATCH 2/2] avoid printing the docker version out in the splash --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 8c554b4dc..d1f7dc1cb 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -42,7 +42,7 @@ end def vvv_is_docker_present() - if system("docker version") + if `docker version` return true end end @@ -344,7 +344,7 @@ if show_logo when 'hyperv' provider_version = 'n/a' when 'docker' - provider_version = VagrantPlugins::DockerProvider::Driver.new.execute("docker", "-v").gsub("Docker version ", "") + provider_version = `docker -v`.gsub("Docker version ", "") else provider_version = '??' end