haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only install Docker if it is not already installed

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

4
plugins/provisioners/docker/installer.rb
View File

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