From 415c3f2c0c1b57d1575f1927e9e01629f83fd39b Mon Sep 17 00:00:00 2001
From: Ben Firshman <ben@firshman.co.uk>
Date: Mon, 8 Dec 2014 16:26:57 -0800
Subject: [PATCH] Don't use boot2docker ISO on disk

This was a hack for the DockerCon demo. We do want some way of
caching the boot2docker image, but this certainly isn't the way.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
---
 drivers/virtualbox/virtualbox.go | 33 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go
index ddcd37d0..b77848ec 100644
--- a/drivers/virtualbox/virtualbox.go
+++ b/drivers/virtualbox/virtualbox.go
@@ -102,28 +102,19 @@ func (d *Driver) Create() error {
 	}
 	d.setMachineNameIfNotSet()
 
-	// HACK: if ~/.docker/boot2docker.iso exists, use that
-	localISOPath := path.Join(os.Getenv("HOME"), ".docker/boot2docker.iso")
-	if _, err := os.Stat(localISOPath); err == nil {
-		cmd := exec.Command("cp", localISOPath, path.Join(d.storePath, "boot2docker.iso"))
-		if err := cmd.Run(); err != nil {
-			return err
-		}
+	if d.Boot2DockerURL != "" {
+		isoURL = d.Boot2DockerURL
 	} else {
-		if d.Boot2DockerURL != "" {
-			isoURL = d.Boot2DockerURL
-		} else {
-			// HACK: Docker 1.3 boot2docker image with client/daemon auth
-			isoURL = "https://bfirsh.s3.amazonaws.com/boot2docker/boot2docker-1.3.1-identity-auth.iso"
-			// isoURL, err = getLatestReleaseURL()
-			// if err != nil {
-			// 	return err
-			// }
-		}
-		log.Infof("Downloading boot2docker...")
-		if err := downloadISO(d.storePath, "boot2docker.iso", isoURL); err != nil {
-			return err
-		}
+		// HACK: Docker 1.3 boot2docker image with client/daemon auth
+		isoURL = "https://bfirsh.s3.amazonaws.com/boot2docker/boot2docker-1.3.1-identity-auth.iso"
+		// isoURL, err = getLatestReleaseURL()
+		// if err != nil {
+		// 	return err
+		// }
+	}
+	log.Infof("Downloading boot2docker...")
+	if err := downloadISO(d.storePath, "boot2docker.iso", isoURL); err != nil {
+		return err
 	}
 
 	log.Infof("Creating SSH key...")