mirror of https://github.com/zulip/zulip.git
Vagrantfile: Update Docker fallback patch for installed but broken case.
The corresponding upstream PR has been updated as well. Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
parent
f366c50913
commit
eeeaf01eef
|
@ -39,7 +39,7 @@ else
|
||||||
method(:usable?).owner == singleton_class or def self.usable?(raise_error=false)
|
method(:usable?).owner == singleton_class or def self.usable?(raise_error=false)
|
||||||
VagrantPlugins::DockerProvider::Driver.new.execute("docker", "version")
|
VagrantPlugins::DockerProvider::Driver.new.execute("docker", "version")
|
||||||
true
|
true
|
||||||
rescue Vagrant::Errors::CommandUnavailable
|
rescue Vagrant::Errors::CommandUnavailable, VagrantPlugins::DockerProvider::Errors::ExecuteError
|
||||||
raise if raise_error
|
raise if raise_error
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue