docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #713 from ehazlett/revert-709 

Revert "Fix check for whether docker is installed"
This commit is contained in:
Evan Hazlett 2015-03-04 13:18:13 -08:00
parent 66664f8b25 8b6ccddd80
commit 71533dd10f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
host.go
View File

@ -401,9 +401,15 @@ func (h *Host) Create(name string) error {
} }
func (h *Host) Provision() 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 // install docker - until cloudinit we use ubuntu everywhere so we
// just install it using the docker repos // 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 { if err != nil {
return err return err
} }