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

Merge pull request #633 from andrewwatson/fix-629-privateip 

Fix #629 by adding PrivateIPAddress to config.json
This commit is contained in:
Evan Hazlett 2015-02-27 15:04:28 -05:00
parent d65f66a75d 0d83d89dd2
commit c99e4f8fe4
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/amazonec2/amazonec2.go
View File

@ -44,6 +44,7 @@ type Driver struct {
InstanceId string InstanceId string
InstanceType string InstanceType string
IPAddress string IPAddress string
PrivateIPAddress string
MachineName string MachineName string
SecurityGroupId string SecurityGroupId string
SecurityGroupName string SecurityGroupName string
@ -269,12 +270,19 @@ func (d *Driver) Create() error {
} }
d.InstanceId = instance.InstanceId d.InstanceId = instance.InstanceId
d.IPAddress = instance.IpAddress
if len(instance.NetworkInterfaceSet) > 0 {
d.PrivateIPAddress = instance.NetworkInterfaceSet[0].PrivateIpAddress
}
d.waitForInstance() d.waitForInstance()
log.Debugf("created instance ID %s, IP address %s", log.Debugf("created instance ID %s, IP address %s, Private IP address %s",
d.InstanceId, d.InstanceId,
d.IPAddress) d.IPAddress,
d.PrivateIPAddress,
)
log.Infof("Waiting for SSH on %s:%d", d.IPAddress, 22) log.Infof("Waiting for SSH on %s:%d", d.IPAddress, 22)
@ -312,14 +320,11 @@ func (d *Driver) Create() error {
} }
func (d *Driver) GetURL() (string, error) { func (d *Driver) GetURL() (string, error) {
ip, err := d.GetIP()
if err != nil { if d.IPAddress == "" {
return "", err
}
if ip == "" {
return "", nil return "", nil
} }
return fmt.Sprintf("tcp://%s:%d", ip, dockerPort), nil return fmt.Sprintf("tcp://%s:%d", d.IPAddress, dockerPort), nil
} }
func (d *Driver) GetIP() (string, error) { func (d *Driver) GetIP() (string, error) {
@ -327,8 +332,8 @@ func (d *Driver) GetIP() (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
d.IPAddress = inst.IpAddress
return d.IPAddress, nil return inst.IpAddress, nil
} }
func (d *Driver) GetState() (state.State, error) { func (d *Driver) GetState() (state.State, error) {