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

fixed b2d hostname regression 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-03-12 12:03:17 -04:00
parent 92bb9e5e20
commit 4a416c6cf7
No known key found for this signature in database
GPG Key ID: A519480096146526
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
host.go
View File

@ -487,6 +487,11 @@ func (h *Host) Create(name string) error {
return err return err
} }
// set hostname
if err := h.SetHostname(); err != nil {
return err
}
// install docker // install docker
if err := h.Provision(); err != nil { if err := h.Provision(); err != nil {
return err return err
@ -519,10 +524,6 @@ func (h *Host) Provision() error {
return fmt.Errorf("error installing docker: %s\n%s\n", err, string(buf.Bytes())) return fmt.Errorf("error installing docker: %s\n%s\n", err, string(buf.Bytes()))
} }
if err := h.SetHostname(); err != nil {
return err
}
return nil return nil
} }
@ -551,6 +552,11 @@ func (h *Host) SetHostname() error {
err error err error
) )
log.Debugf("setting hostname for provider type %s: %s",
h.Driver.GetProviderType(),
h.Name,
)
switch h.Driver.GetProviderType() { switch h.Driver.GetProviderType() {
case provider.Local: case provider.Local:
cmd, err = h.GetSSHCommand(fmt.Sprintf( cmd, err = h.GetSSHCommand(fmt.Sprintf(