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

debian: rebase and streamline sudo install 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-05-26 14:59:47 -04:00
parent 290ead9ea0
commit 3e1a6ed98c
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libmachine/provision/debian.go
View File

@ -3,8 +3,6 @@ package provision
import (
"bytes"
"fmt"
"io/ioutil"
"strings"
"text/template"
"github.com/docker/machine/drivers"
@ -111,28 +109,10 @@ func (provisioner *DebianProvisioner) Provision(swarmOptions swarm.SwarmOptions,
provisioner.EngineOptions.StorageDriver = "aufs"
}
// HACK: since debian does not come with sudo by default,
// we check if present and install first
out, err := provisioner.SSHCommand("which sudo")
if err != nil {
log.Debug("sudo not found; attempting to install")
// HACK: command not found which is what we are looking for;
// since we only get back the string we check it :(
if strings.Index(err.Error(), "Process exited with: 1") != -1 {
res, err := ioutil.ReadAll(out.Stdout)
if err != nil {
return err
}
if string(res) == "" {
log.Debug("installing sudo")
if _, err := provisioner.SSHCommand("apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y sudo"); err != nil {
return err
}
}
} else {
return err
}
// HACK: since debian does not come with sudo by default we install
log.Debug("installing sudo")
if _, err := provisioner.SSHCommand("if ! type sudo; then apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y sudo; fi"); err != nil {
return err
}
log.Debug("setting hostname")