Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

keep global b2d iso cache when using custom b2d iso

Browse Source 
Signed-off-by: Ke Zhu <kzhu@us.ibm.com>
This commit is contained in:
Ke Zhu
2015-03-23 11:58:47 -04:00
committed by Evan Hazlett
parent bde6ad3fac
commit f92f57cd4d
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/virtualbox/virtualbox.go
View File

@@ -182,7 +182,7 @@ func (d *Driver) Create() error {
if d.Boot2DockerURL != "" {
isoURL = d.Boot2DockerURL
log.Infof("Downloading %s from %s...", isoFilename, isoURL)
if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil {
if err := b2dutils.DownloadISO(d.storePath, isoFilename, isoURL); err != nil {
return err
}
} else {
@@ -199,11 +199,11 @@ func (d *Driver) Create() error {
return err
}
}
}
isoDest := filepath.Join(d.storePath, isoFilename)
if err := utils.CopyFile(commonIsoPath, isoDest); err != nil {
return err
isoDest := filepath.Join(d.storePath, isoFilename)
if err := utils.CopyFile(commonIsoPath, isoDest); err != nil {
return err
}
}
log.Infof("Creating SSH key...")

10
drivers/vmwarefusion/fusion_darwin.go
View File

@@ -216,7 +216,7 @@ func (d *Driver) Create() error {
if d.Boot2DockerURL != "" {
isoURL = d.Boot2DockerURL
log.Infof("Downloading boot2docker.iso from %s...", isoURL)
if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil {
if err := b2dutils.DownloadISO(d.storePath, isoFilename, isoURL); err != nil {
return err
}
} else {
@@ -244,11 +244,11 @@ func (d *Driver) Create() error {
return err
}
}
}
isoDest := filepath.Join(d.storePath, isoFilename)
if err := utils.CopyFile(commonIsoPath, isoDest); err != nil {
return err
isoDest := filepath.Join(d.storePath, isoFilename)
if err := utils.CopyFile(commonIsoPath, isoDest); err != nil {
return err
}
}
log.Infof("Creating SSH key...")

12
drivers/vmwarevsphere/vsphere.go
View File

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