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

Merge pull request #506 from ehazlett/use-vmw-iso 

use custom vmware b2d iso for fusion and vsphere
This commit is contained in:
Evan Hazlett 2015-02-10 14:35:23 -05:00
parent 734d3338d7 1198cb539a
commit 6feb419b73
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/vmwarefusion/fusion_darwin.go
View File

@ -31,6 +31,7 @@ const (
B2D_USER = "docker" B2D_USER = "docker"
B2D_PASS = "tcuser" B2D_PASS = "tcuser"
dockerConfigDir = "/var/lib/boot2docker" dockerConfigDir = "/var/lib/boot2docker"
isoFilename = "boot2docker-vmw.iso"
) )
// Driver for VMware Fusion // Driver for VMware Fusion
@ -96,7 +97,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.Memory = flags.Int("vmwarefusion-memory-size") d.Memory = flags.Int("vmwarefusion-memory-size")
d.DiskSize = flags.Int("vmwarefusion-disk-size") d.DiskSize = flags.Int("vmwarefusion-disk-size")
d.Boot2DockerURL = flags.String("vmwarefusion-boot2docker-url") d.Boot2DockerURL = flags.String("vmwarefusion-boot2docker-url")
d.ISO = path.Join(d.storePath, "boot2docker.iso") d.ISO = path.Join(d.storePath, isoFilename)
return nil return nil
} }
@ -145,45 +146,41 @@ 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(d.storePath, "boot2docker.iso", isoURL); err != nil { if err := b2dutils.DownloadISO(d.storePath, isoFilename, isoURL); err != nil {
return err return err
} }
} else { } else {
// todo: check latest release URL, download if it's new // TODO: until vmw tools are merged into b2d master
// until then always use "latest" // we will use the iso from the vmware team
isoURL, err = b2dutils.GetLatestBoot2DockerReleaseURL() //// todo: check latest release URL, download if it's new
if err != nil { //// until then always use "latest"
log.Warnf("Unable to check for the latest release: %s", err) //isoURL, err = b2dutils.GetLatestBoot2DockerReleaseURL()
//if err != nil {
// log.Warnf("Unable to check for the latest release: %s", err)
//}
isoURL := "https://github.com/cloudnativeapps/boot2docker/releases/download/v1.4.1-vmw/boot2docker-1.4.1-vmw.iso"
}
// todo: use real constant for .docker
rootPath := filepath.Join(utils.GetDockerDir()) rootPath := filepath.Join(utils.GetDockerDir())
imgPath := filepath.Join(rootPath, "images") imgPath := filepath.Join(rootPath, "images")
commonIsoPath := filepath.Join(imgPath, "boot2docker.iso") commonIsoPath := filepath.Join(imgPath, isoFilename)
if _, err := os.Stat(commonIsoPath); os.IsNotExist(err) { if _, err := os.Stat(commonIsoPath); os.IsNotExist(err) {
log.Infof("Downloading boot2docker.iso to %s...", commonIsoPath) log.Infof("Downloading boot2docker.iso to %s...", commonIsoPath)
// just in case boot2docker.iso has been manually deleted // just in case boot2docker.iso has been manually deleted
if _, err := os.Stat(imgPath); os.IsNotExist(err) { if _, err := os.Stat(imgPath); os.IsNotExist(err) {
if err := os.Mkdir(imgPath, 0700); err != nil { if err := os.Mkdir(imgPath, 0700); err != nil {
return err return err
} }
} }
if err := b2dutils.DownloadISO(imgPath, "boot2docker.iso", isoURL); err != nil { if err := b2dutils.DownloadISO(imgPath, isoFilename, isoURL); err != nil {
return err return err
} }
} }
isoDest := filepath.Join(d.storePath, "boot2docker.iso") 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...")

26
drivers/vmwarevsphere/vsphere.go
View File

@ -28,7 +28,7 @@ import (
const ( const (
DATASTORE_DIR = "boot2docker-iso" DATASTORE_DIR = "boot2docker-iso"
B2D_ISO_NAME = "boot2docker.iso" B2D_ISO_NAME = "boot2docker-vmw.iso"
DEFAULT_CPU_NUMBER = 2 DEFAULT_CPU_NUMBER = 2
dockerConfigDir = "/var/lib/boot2docker" dockerConfigDir = "/var/lib/boot2docker"
B2D_USER = "docker" B2D_USER = "docker"
@ -245,17 +245,21 @@ func (d *Driver) Create() error {
} }
} else { } else {
// todo: check latest release URL, download if it's new // TODO: until vmw tools are merged into b2d master
// until then always use "latest" // we will use the iso from the vmware team
isoURL, err = b2dutils.GetLatestBoot2DockerReleaseURL() //// todo: check latest release URL, download if it's new
if err != nil { //// until then always use "latest"
log.Warnf("Unable to check for the latest release: %s", err) //isoURL, err = b2dutils.GetLatestBoot2DockerReleaseURL()
//if err != nil {
// log.Warnf("Unable to check for the latest release: %s", err)
//}
isoURL := "https://github.com/cloudnativeapps/boot2docker/releases/download/v1.4.1-vmw/boot2docker-1.4.1-vmw.iso"
}
// todo: use real constant for .docker
rootPath := filepath.Join(utils.GetDockerDir()) rootPath := filepath.Join(utils.GetDockerDir())
imgPath := filepath.Join(rootPath, "images") imgPath := filepath.Join(rootPath, "images")
commonIsoPath := filepath.Join(imgPath, "boot2docker.iso") commonIsoPath := filepath.Join(imgPath, B2D_ISO_NAME)
if _, err := os.Stat(commonIsoPath); os.IsNotExist(err) { if _, err := os.Stat(commonIsoPath); os.IsNotExist(err) {
log.Infof("Downloading boot2docker.iso to %s...", commonIsoPath) log.Infof("Downloading boot2docker.iso to %s...", commonIsoPath)
// just in case boot2docker.iso has been manually deleted // just in case boot2docker.iso has been manually deleted
@ -266,13 +270,13 @@ func (d *Driver) Create() error {
} }
} }
if err := b2dutils.DownloadISO(imgPath, "boot2docker.iso", isoURL); err != nil { if err := b2dutils.DownloadISO(imgPath, B2D_ISO_NAME, isoURL); err != nil {
return err return err
} }
} }
isoDest := filepath.Join(d.storePath, "boot2docker.iso") isoDest := filepath.Join(d.storePath, B2D_ISO_NAME)
if err := utils.CopyFile(commonIsoPath, isoDest); err != nil { if err := utils.CopyFile(commonIsoPath, isoDest); err != nil {
return err return err