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

fixed b2d url bug with fusion / vsphere 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-03-18 14:08:47 -04:00
parent 2151492dec
commit bde6ad3fac
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/vmwarefusion/fusion_darwin.go
View File

@ -211,16 +211,14 @@ func (d *Driver) Create() error {
if err := os.Mkdir(imgPath, 0700); err != nil { if err := os.Mkdir(imgPath, 0700); err != nil {
return err return err
} }
} }
if d.Boot2DockerURL != "" { if d.Boot2DockerURL != "" {
isoURL = d.Boot2DockerURL isoURL = d.Boot2DockerURL
log.Infof("Downloading boot2docker.iso from %s...", isoURL) log.Infof("Downloading boot2docker.iso from %s...", isoURL)
if err := b2dutils.DownloadISO(commonIsoPath, isoFilename, isoURL); err != nil { if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil {
return err return err
} }
} else { } else {
// TODO: until vmw tools are merged into b2d master // TODO: until vmw tools are merged into b2d master
// we will use the iso from the vmware team. // we will use the iso from the vmware team.
@ -246,11 +244,12 @@ func (d *Driver) Create() error {
return err return err
} }
} }
}
isoDest := filepath.Join(d.storePath, isoFilename) isoDest := filepath.Join(d.storePath, isoFilename)
if err := utils.CopyFile(commonIsoPath, isoDest); err != nil { if err := utils.CopyFile(commonIsoPath, isoDest); err != nil {
return err return err
} }
}
log.Infof("Creating SSH key...") log.Infof("Creating SSH key...")
if err := ssh.GenerateSSHKey(d.GetSSHKeyPath()); err != nil { if err := ssh.GenerateSSHKey(d.GetSSHKeyPath()); err != nil {

6
drivers/vmwarevsphere/vsphere.go
View File

@ -301,7 +301,7 @@ func (d *Driver) Create() error {
if d.Boot2DockerURL != "" { if d.Boot2DockerURL != "" {
isoURL = d.Boot2DockerURL isoURL = d.Boot2DockerURL
log.Infof("Downloading boot2docker.iso from %s...", isoURL) log.Infof("Downloading boot2docker.iso from %s...", isoURL)
if err := b2dutils.DownloadISO(commonIsoPath, isoFilename, isoURL); err != nil { if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil {
return err return err
} }
@ -336,14 +336,14 @@ func (d *Driver) Create() error {
} }
} }
}
isoDest := filepath.Join(d.storePath, isoFilename) isoDest := filepath.Join(d.storePath, isoFilename)
if err := utils.CopyFile(commonIsoPath, isoDest); err != nil { if err := utils.CopyFile(commonIsoPath, isoDest); err != nil {
return err return err
} }
}
log.Infof("Generating SSH Keypair...") log.Infof("Generating SSH Keypair...")
if err := ssh.GenerateSSHKey(d.GetSSHKeyPath()); err != nil { if err := ssh.GenerateSSHKey(d.GetSSHKeyPath()); err != nil {
return err return err