Just use the presence of the environment variable DOCKER_MACHINE_NAME…

… on Windows to determine if the path should be changed Updated to terragrunt v0.12.18.02 (Coveo edition)
coveooss · May 25, 2017 · 4bba960 · 4bba960
1 parent 2ed0edd
commit 4bba960
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:latest
 
 ARG TERRAFORM_VERSION=0.9.5
-ARG TERRAGRUNT_VERSION=0.12.18.01
+ARG TERRAGRUNT_VERSION=0.12.18.02
 ARG GOTEMPLATE_VERSION=1.0
 
 LABEL vendor="Coveo"

diff --git a/Dockerfile.Full b/Dockerfile.Full
@@ -1,7 +1,7 @@
 FROM ubuntu:latest
 
 ARG TERRAFORM_VERSION=0.9.5
-ARG TERRAGRUNT_VERSION=0.12.18.01
+ARG TERRAGRUNT_VERSION=0.12.18.02
 ARG GOTEMPLATE_VERSION=1.0
 
 ARG DEBIAN_FRONTEND=noninteractive

diff --git a/Dockerfile.Shell b/Dockerfile.Shell
@@ -1,7 +1,7 @@
 FROM alpine:latest
 
 ARG TERRAFORM_VERSION=0.9.5
-ARG TERRAGRUNT_VERSION=0.12.18.01
+ARG TERRAGRUNT_VERSION=0.12.18.02
 ARG GOTEMPLATE_VERSION=1.0
 
 LABEL vendor="Coveo"

diff --git a/docker.go b/docker.go
@@ -103,18 +103,10 @@ func getEnviron() (result []string) {
 
 // This function set the path converter function
 // For old Windows version still using docker-machine and VirtualBox,
-// it transforms the C:\ to \C\.
+// it transforms the C:\ to /C/.
 func getPathConversionFunction() func(string) string {
-	noConversion := func(path string) string { return path }
-	if runtime.GOOS != "windows" {
-		return noConversion
-	}
-
-	var out bytes.Buffer
-	dockerCmd := exec.Command("docker-machine", "env")
-	dockerCmd.Stdout, dockerCmd.Stderr = &out, &out
-	if dockerCmd.Run() != nil {
-		return noConversion
+	if runtime.GOOS != "windows" || os.Getenv("DOCKER_MACHINE_NAME") == "" {
+		return func(path string) string { return path }
 	}
 
 	return func(path string) string {