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

revert to GetSSHHostname based on feedback from @nathanleclaire 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-03-09 15:55:18 -04:00
parent 2b6daa29ed
commit c76d1a253f
No known key found for this signature in database
GPG Key ID: A519480096146526
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands_test.go
View File

@ -52,7 +52,7 @@ func (d *FakeDriver) GetIP() (string, error) {
return "", nil return "", nil
} }
func (d *FakeDriver) GetSSHAddress() (string, error) { func (d *FakeDriver) GetSSHHostname() (string, error) {
return "", nil return "", nil
} }

2
drivers/amazonec2/amazonec2.go
View File

@ -419,7 +419,7 @@ func (d *Driver) GetState() (state.State, error) {
return state.None, nil return state.None, nil
} }
func (d *Driver) GetSSHAddress() (string, error) { func (d *Driver) GetSSHHostname() (string, error) {
// TODO: use @nathanleclaire retry func here (ehazlett) // TODO: use @nathanleclaire retry func here (ehazlett)
return d.GetIP() return d.GetIP()
} }

2
drivers/drivers.go
View File

@ -39,7 +39,7 @@ type Driver interface {
GetMachineName() string GetMachineName() string
// GetSSHHostname returns hostname for use with ssh // GetSSHHostname returns hostname for use with ssh
GetSSHAddress() (string, error) GetSSHHostname() (string, error)
// GetSSHKeyPath returns key path for use with ssh // GetSSHKeyPath returns key path for use with ssh
GetSSHKeyPath() string GetSSHKeyPath() string

2
drivers/none/none.go
View File

@ -62,7 +62,7 @@ func (d *Driver) GetMachineName() string {
return "" return ""
} }
func (d *Driver) GetSSHAddress() (string, error) { func (d *Driver) GetSSHHostname() (string, error) {
return "", nil return "", nil
} }

2
host.go
View File

@ -525,7 +525,7 @@ func (h *Host) Provision() error {
} }
func (h *Host) GetSSHCommand(args ...string) (*exec.Cmd, error) { func (h *Host) GetSSHCommand(args ...string) (*exec.Cmd, error) {
addr, err := h.Driver.GetSSHAddress() addr, err := h.Driver.GetSSHHostname()
if err != nil { if err != nil {
return nil, err return nil, err
} }