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

Cosmetics 

Signed-off-by: David Gageot <david@gageot.net>
This commit is contained in:
David Gageot 2015-11-30 09:45:21 +01:00
parent fea0dcb3da
commit ec76843e03
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/google/compute_util.go
View File

@ -57,7 +57,7 @@ func newComputeUtil(driver *Driver) (*ComputeUtil, error) {
return nil, err return nil, err
} }
c := ComputeUtil{ return &ComputeUtil{
zone: driver.Zone, zone: driver.Zone,
instanceName: driver.MachineName, instanceName: driver.MachineName,
userName: driver.SSHUser, userName: driver.SSHUser,
@ -71,8 +71,7 @@ func newComputeUtil(driver *Driver) (*ComputeUtil, error) {
globalURL: apiURL + driver.Project + "/global", globalURL: apiURL + driver.Project + "/global",
SwarmMaster: driver.SwarmMaster, SwarmMaster: driver.SwarmMaster,
SwarmHost: driver.SwarmHost, SwarmHost: driver.SwarmHost,
} }, nil
return &c, nil
} }
func (c *ComputeUtil) diskName() string { func (c *ComputeUtil) diskName() string {

2
drivers/google/google.go
View File

@ -224,6 +224,7 @@ func (d *Driver) GetURL() (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil return fmt.Sprintf("tcp://%s", net.JoinHostPort(ip, "2376")), nil
} }
@ -328,6 +329,7 @@ func (d *Driver) Remove() error {
if err != nil { if err != nil {
return err return err
} }
s, err := d.GetState() s, err := d.GetState()
if err != nil { if err != nil {
return err return err