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

configure opts for b2d 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-01-10 11:21:30 -05:00
parent 4a47ce01fe
commit fc2e5f278b
4 changed files with 30 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/amazonec2/amazonec2.go
View File

@ -31,7 +31,6 @@ const (
type Driver struct {
Id string
MachineName string
AccessKey string
SecretKey string
SessionToken string

53
drivers/virtualbox/virtualbox.go
View File

@ -324,50 +324,19 @@ func (d *Driver) Create() error {
return err
}
//log.Debugf("Adding key to authorized-keys.d...")
cmd, err := d.GetSSHCommand(fmt.Sprintf(
"sudo hostname %s && echo \"%s\" | sudo tee /var/lib/boot2docker/etc/hostname",
d.MachineName,
d.MachineName,
))
if err != nil {
return err
//cmd, err := d.GetSSHCommand("sudo mkdir -p /var/lib/boot2docker/.docker && sudo chown -R docker /var/lib/boot2docker/.docker")
//if err != nil {
// return err
//}
//if err := cmd.Run(); err != nil {
// return err
//}
}
if err := cmd.Run(); err != nil {
return err
//if err := drivers.AddPublicKeyToAuthorizedHosts(d, "/var/lib/boot2docker/.docker/authorized-keys.d"); err != nil {
// return err
//}
//// HACK: configure docker to use persisted auth
//cmd, err = d.GetSSHCommand("echo DOCKER_TLS=no | sudo tee -a /var/lib/boot2docker/profile")
//if err != nil {
// return err
//}
//if err := cmd.Run(); err != nil {
// return err
//}
//extraArgs := `EXTRA_ARGS='--auth=identity
//--auth-authorized-dir=/var/lib/boot2docker/.docker/authorized-keys.d
//--auth-known-hosts=/var/lib/boot2docker/.docker/known-hosts.json
//--identity=/var/lib/boot2docker/.docker/key.json
//-H tcp://0.0.0.0:2376'`
//sshCmd := fmt.Sprintf("echo \"%s\" | sudo tee -a /var/lib/boot2docker/profile", extraArgs)
//cmd, err = d.GetSSHCommand(sshCmd)
//if err != nil {
// return err
//}
//if err := cmd.Run(); err != nil {
// return err
//}
//cmd, err = d.GetSSHCommand("sudo /etc/init.d/docker restart")
//if err != nil {
// return err
//}
//if err := cmd.Run(); err != nil {
// return err
//}
}
return nil
}

2
drivers/vmwarefusion/fusion.go
View File

@ -293,6 +293,8 @@ func (d *Driver) StartDocker() error {
func (d *Driver) StopDocker() error {
log.Debug("Stopping Docker...")
// TODO @ehazlett - should we add this exit to make sure it doesn't
// break if the daemon isn't running or add an arg?
cmd, err := d.GetSSHCommand("sudo /etc/init.d/docker stop ; exit 0")
if err != nil {
return err

27
host.go
View File

@ -5,10 +5,10 @@ import (
"fmt"
"io/ioutil"
"net"
"net/url"
"os"
"path/filepath"
"regexp"
"time"
log "github.com/Sirupsen/logrus"
"github.com/docker/machine/drivers"
@ -211,24 +211,31 @@ func (h *Host) ConfigureAuth() error {
return err
}
daemonOpts := fmt.Sprintf(`--tlsverify \
--tlsverify \
--tlscacert=%s \
--tlskey=%s \
--tlscert=%s \
--host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2376`, machineCaCertPath,
machineServerKeyPath, machineServerCertPath)
var (
daemonOpts string
daemonOptsCfg string
daemonCfg string
)
switch d.DriverName() {
case "virtualbox", "vmwarefusion", "vmwarevsphere":
daemonOpts = "--host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2376"
daemonOptsCfg = filepath.Join(d.GetDockerConfigDir(), "profile")
daemonCfg = fmt.Sprintf("EXTRA_ARGS='%s'", daemonOpts)
daemonCfg = fmt.Sprintf(`EXTRA_ARGS='%s'
CACERT=%s
SERVERCERT=%s
SERVERKEY=%s
DOCKER_TLS=auto`, daemonOpts, machineCaCertPath, machineServerCertPath, machineServerKeyPath)
default:
// TODO @ehazlett - use a template here
daemonOpts = fmt.Sprintf(`--tlsverify \
--tlsverify \
--tlscacert=%s \
--tlskey=%s \
--tlscert=%s \
--host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2376`, machineCaCertPath,
machineServerKeyPath, machineServerCertPath)
daemonOptsCfg = "/etc/default/docker"
daemonCfg = fmt.Sprintf("export DOCKER_OPTS='%s'", daemonOpts)
}