From ddc0c50b9170029d67b21e769aa2796af0d2ad6d Mon Sep 17 00:00:00 2001 From: Nathan LeClaire Date: Wed, 4 Mar 2015 11:34:48 -0800 Subject: [PATCH] Fix check for whether docker is installed Signed-off-by: Nathan LeClaire --- host.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/host.go b/host.go index fe7817e4d0..0f030d86cc 100644 --- a/host.go +++ b/host.go @@ -401,15 +401,9 @@ func (h *Host) Create(name string) error { } func (h *Host) Provision() error { - // "local" providers use b2d; no provisioning necessary - switch h.Driver.DriverName() { - case "none", "virtualbox", "vmwarefusion", "vmwarevsphere": - return nil - } - // install docker - until cloudinit we use ubuntu everywhere so we // just install it using the docker repos - cmd, err := h.Driver.GetSSHCommand("if [ ! -e /usr/bin/docker ]; then curl -sSL https://get.docker.com | sh -; fi") + cmd, err := h.Driver.GetSSHCommand("command -v docker || curl -sSL https://get.docker.com | sh -;") if err != nil { return err }