upstream/vagrant
1
0
Fork 0
mirror of https://github.com/hashicorp/vagrant.git synced 2026-05-28 04:36:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Only install Docker if it is not already installed

Browse source
This commit is contained in:
Seth Vargo 2015-11-19 18:25:28 -08:00
parent f5a0c3ed5b
commit bad4c2103d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/provisioners/docker/installer.rb
View file

@ -14,13 +14,13 @@ module VagrantPlugins
return
end
@machine.ui.detail(I18n.t("vagrant.docker_installing"))
@machine.guest.capability(:docker_install)
if !@machine.guest.capability(:docker_installed)
@machine.ui.detail(I18n.t("vagrant.docker_installing"))
@machine.guest.capability(:docker_install)
end
if !@machine.guest.capability(:docker_installed)
if !@machine.guest.capability(:docker_installed)
raise DockerError, :install_failed
end
raise DockerError, :install_failed
end
if @machine.guest.capability?(:docker_configure_vagrant_user)