use info to detect docker toolbox

Author: michele-sciabarra

iosdk/docker_test.go

@@ -30,9 +30,9 @@ func ExampleDockerIP() {
 func ExampleDockerInfo() {
 	DryRunPush("!bad", "Info: hello")
 	out, err := dockerInfo()
-	fmt.Println(1, err, out)
+	fmt.Println(1, err, out+"*")
 	out, err = dockerInfo()
-	fmt.Println(2, err, out)
+	fmt.Println(2, err, out+"*")
 	// Output:
 	// docker info
 	// 1 Docker is not running

iosdk/ide.go

@@ -4,18 +4,20 @@ import (
 	"fmt"
 	"os/user"
 	"path/filepath"
+	"regexp"
+	"strings"
 )
 
 // IdeDeploy deploys and mounts a folder
-func IdeDeploy(dir string) error {
+func IdeDeploy(dir string, info string) error {
 	fmt.Println("Deploying IDE...")
 	if dir != "" {
 		err := preflightInHomePath(dir)
 		if err != nil {
 			return err
 		}
 	}
-	return ideDockerRun(dir)
+	return ideDockerRun(dir, info)
 }
 
 // IdeDestroy destroys ide
@@ -27,7 +29,7 @@ func IdeDestroy() error {
 
 // ideDockerRun starts the ide
 // it also mounts the project folder if the directory is not empty
-func ideDockerRun(dir string) (err error) {
+func ideDockerRun(dir string, info string) (err error) {
 	image := IdeImage + ":" + Version
 	if err = dockerPull(image); err != nil {
 		return err
@@ -37,6 +39,7 @@ func ideDockerRun(dir string) (err error) {
 		dir, err = filepath.Abs(dir)
 		LogIf(err)
 		if err == nil {
+			dir = fixPathDockerToolbox(dir, info)
 			mount = fmt.Sprintf("-v %s:/home/project", dir)
 		}
 	}
@@ -67,3 +70,20 @@ func OpenWhiskDockerWait() error {
 	fmt.Println(Sys("docker exec iosdk-whisk waitready"))
 	return nil
 }
+
+// on windows if you are using Docker Toolbox you need to change the path format
+// it expects an absolute path starting with `<drive>:` in windows
+func fixPathDockerToolbox(dir string, info string) string {
+	if RuntimeOS != "windows" {
+		return dir
+	}
+	var search = regexp.MustCompile(`Operating System: Boot2Docker`)
+	if search.FindString(info) == "" {
+		return dir
+	}
+	dir = strings.ReplaceAll(dir, "\\", "/")
+	if dir[1] == ':' {
+		dir = "/" + string(dir[0]) + dir[2:]
+	}
+	return dir
+}

iosdk/ide_test.go

@@ -10,13 +10,13 @@ func ExampleIdeDockerRun() {
 		"", "Error:",
 		"", "172.17.0.2")
 	RuntimeOS = "darwin"
-	fmt.Println(1, ideDockerRun("/tmp"))
-	fmt.Println(2, ideDockerRun("/tmp"))
-	fmt.Println(3, ideDockerRun(""))
+	fmt.Println(1, ideDockerRun("/tmp", ""))
+	fmt.Println(2, ideDockerRun("/tmp", ""))
+	fmt.Println(3, ideDockerRun("", ""))
 	// Output:
 	// docker pull pagopa/iosdk-theia:test
 	// docker inspect --format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}} iosdk-openwhisk
-	// docker run -d -p 3000:3000 --rm --name iosdk-theia -e HOME=/home/project -v /tmp:/home/project --add-host=openwhisk:172.17.0.2 pagopa/iosdk-theia:test 
+	// docker run -d -p 3000:3000 --rm --name iosdk-theia -e HOME=/home/project -v /tmp:/home/project --add-host=openwhisk:172.17.0.2 pagopa/iosdk-theia:test
 	// 1 <nil>
 	// docker pull pagopa/iosdk-theia:test
 	// docker inspect --format={{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}} iosdk-openwhisk
@@ -36,3 +36,17 @@ func ExampleIdeDockerRm() {
 	// docker kill iosdk-theia
 	// 172.17.0.3
 }
+
+func ExampleFixPathDockerToolbox() {
+	RuntimeOS = "linux"
+	fmt.Println(fixPathDockerToolbox("a\\b", "does not matter"))
+	RuntimeOS = "windows"
+	fmt.Println(fixPathDockerToolbox("a\\b", "does not matter"))
+	fmt.Println(fixPathDockerToolbox("a\\b", "\nOperating System: Boot2Docker etc etc"))
+	fmt.Println(fixPathDockerToolbox("c:\\a\\b", "\nOperating System: Boot2Docker etc etc"))
+	// Output:
+	// a\b
+	// a\b
+	// a/b
+	// /c/a/b
+}

iosdk/main.go

@@ -62,7 +62,8 @@ func parseDebug(cmd string) bool {
 		WskPropsSave()
 	case ideDeployCmd.FullCommand():
 		FatalIf(ConfigLoad())
-		IdeDeploy(Config.AppDir)
+		info, _ := Preflight(Config.AppDir)
+		IdeDeploy(Config.AppDir, info)
 		configureIde()
 	case ideDestroyCmd.FullCommand():
 		IdeDestroy()

iosdk/preflight.go

@@ -48,24 +48,24 @@ func preflightInHomePath(dir string) error {
 }
 
 // Preflight perform preflight checks
-func Preflight(dir string) error {
+func Preflight(dir string) (string, error) {
 	info, err := dockerInfo()
 	if err != nil {
-		return err
+		return "", err
 	}
 	err = preflightDockerMemory(info)
 	if err != nil {
-		return err
+		return "", err
 	}
 	err = preflightEnsureDockerVersion()
 	if err != nil {
-		return err
+		return "", err
 	}
 	err = preflightInHomePath(dir)
 	if err != nil {
-		return err
+		return "", err
 	}
-	return nil
+	return info, nil
 }
 
 // preflightDockerMemory checks docker memory

iosdk/preflight_test.go

@@ -42,6 +42,6 @@ func ExamplePreflightDockerMemory() {
 	// Output:
 	// docker info
 	// <nil>
-	// docker info
+	/// docker info
 	// IOSDK needs 4GB memory allocatable on docker
 }

iosdk/start.go

@@ -8,7 +8,7 @@ func Start() error {
 		fmt.Println("You need to run 'iosdk init ', first.")
 		return err
 	}
-	err := Preflight(Config.AppDir)
+	info, err := Preflight(Config.AppDir)
 	if err != nil {
 		return err
 	}
@@ -25,7 +25,7 @@ func Start() error {
 		return err
 	}
 	if !*skipIde {
-		err = IdeDeploy(Config.AppDir)
+		err = IdeDeploy(Config.AppDir, info)
 		if err != nil {
 			return err
 		}