Skip to content

Commit bca99e4

Browse files
authored
Merge pull request #2718 from Varying-Vagrant-Vagrants/fix/parallels-docker-detection
Improve docker/parallels detection
2 parents f375014 + e10bc48 commit bca99e4

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

Vagrantfile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,13 @@ end
4242

4343

4444
def vvv_is_docker_present()
45-
VagrantPlugins::DockerProvider::Driver.new.execute("docker", "version")
46-
return true
47-
rescue Vagrant::Errors::CommandUnavailable
48-
return false
45+
if `docker version`
46+
return true
47+
end
4948
end
5049

5150
def vvv_is_parallels_present()
52-
VagrantPlugins::DockerProvider::Driver.new.execute("prctl", "version")
53-
return true
54-
rescue Vagrant::Errors::CommandUnavailable
55-
return false
51+
return Vagrant.has_plugin?("vagrant-parallels")
5652
end
5753

5854
vagrant_dir = __dir__
@@ -348,7 +344,7 @@ if show_logo
348344
when 'hyperv'
349345
provider_version = 'n/a'
350346
when 'docker'
351-
provider_version = VagrantPlugins::DockerProvider::Driver.new.execute("docker", "-v").gsub("Docker version ", "")
347+
provider_version = `docker -v`.gsub("Docker version ", "")
352348
else
353349
provider_version = '??'
354350
end

0 commit comments

Comments
 (0)