From 8b6ccddd801e2f2397ea116ed82f6c936485931f Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Wed, 4 Mar 2015 13:17:00 -0800 Subject: [PATCH] Revert "Fix check for whether docker is installed" we need to revisit This reverts commit ddc0c50b9170029d67b21e769aa2796af0d2ad6d. Signed-off-by: Evan Hazlett --- host.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/host.go b/host.go index 0f030d86cc..fe7817e4d0 100644 --- a/host.go +++ b/host.go @@ -401,9 +401,15 @@ 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("command -v docker || curl -sSL https://get.docker.com | sh -;") + cmd, err := h.Driver.GetSSHCommand("if [ ! -e /usr/bin/docker ]; then curl -sSL https://get.docker.com | sh -; fi") if err != nil { return err }