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

Merge pull request #3067 from dgageot/3056-ls-timeout 

FIX #3056 ls timeout when instance is stopped
This commit is contained in:
David Gageot 2016-02-18 08:41:43 +01:00
parent 7ec902189d ffb9cbed7a
commit 5918c13d22
9 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/amazonec2/amazonec2.go
View File

@ -603,6 +603,10 @@ func (d *Driver) Create() error {
}
func (d *Driver) GetURL() (string, error) {
if err := drivers.MustBeRunning(d); err != nil {
return "", err
}
ip, err := d.GetIP()
if err != nil {
return "", err
@ -610,6 +614,7 @@ func (d *Driver) GetURL() (string, error) {
if ip == "" {
return "", nil
}
return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, strconv.Itoa(dockerPort))), nil
}

4
drivers/azure/azure.go
View File

@ -238,6 +238,10 @@ func (d *Driver) Create() error {
}
func (d *Driver) GetURL() (string, error) {
if err := drivers.MustBeRunning(d); err != nil {
return "", err
}
url := fmt.Sprintf("tcp://%s:%v", d.getHostname(), d.DockerPort)
return url, nil
}

5
drivers/digitalocean/digitalocean.go
View File

@ -255,10 +255,15 @@ func (d *Driver) createSSHKey() (*godo.Key, error) {
}
func (d *Driver) GetURL() (string, error) {
if err := drivers.MustBeRunning(d); err != nil {
return "", err
}
ip, err := d.GetIP()
if err != nil {
return "", err
}
return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
}

5
drivers/exoscale/exoscale.go
View File

@ -143,10 +143,15 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
}
func (d *Driver) GetURL() (string, error) {
if err := drivers.MustBeRunning(d); err != nil {
return "", err
}
ip, err := d.GetIP()
if err != nil {
return "", err
}
return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
}

5
drivers/generic/generic.go
View File

@ -133,10 +133,15 @@ func (d *Driver) Create() error {
}
func (d *Driver) GetURL() (string, error) {
if err := drivers.MustBeRunning(d); err != nil {
return "", err
}
ip, err := d.GetIP()
if err != nil {
return "", err
}
return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
}

5
drivers/openstack/openstack.go
View File

@ -276,6 +276,10 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
}
func (d *Driver) GetURL() (string, error) {
if err := drivers.MustBeRunning(d); err != nil {
return "", err
}
ip, err := d.GetIP()
if err != nil {
return "", err
@ -283,6 +287,7 @@ func (d *Driver) GetURL() (string, error) {
if ip == "" {
return "", nil
}
return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
}

5
drivers/softlayer/driver.go
View File

@ -257,6 +257,10 @@ func (d *Driver) DriverName() string {
}
func (d *Driver) GetURL() (string, error) {
if err := drivers.MustBeRunning(d); err != nil {
return "", err
}
ip, err := d.GetIP()
if err != nil {
return "", err
@ -264,6 +268,7 @@ func (d *Driver) GetURL() (string, error) {
if ip == "" {
return "", nil
}
return "tcp://" + net.JoinHostPort(ip, "2376"), nil
}

4
drivers/vmwarevcloudair/vcloudair.go
View File

@ -196,6 +196,10 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
}
func (d *Driver) GetURL() (string, error) {
if err := drivers.MustBeRunning(d); err != nil {
return "", err
}
return fmt.Sprintf("tcp://%s", net.JoinHostPort(d.PublicIP, strconv.Itoa(d.DockerPort))), nil
}

14
libmachine/drivers/drivers.go
View File

@ -93,3 +93,17 @@ func MachineInState(d Driver, desiredState state.State) func() bool {
return false
}
}
// MustBeRunning will return an error if the machine is not in a running state.
func MustBeRunning(d Driver) error {
s, err := d.GetState()
if err != nil {
return err
}
if s != state.Running {
return ErrHostIsNotRunning
}
return nil
}