Set COMPOSE_CONVERT_WINDOWS_PATHS Windows docker ddev-router failure, f…

…ixes #739 (#753)
ddev · Mar 27, 2018 · b108ac6 · b108ac6
1 parent ed03c1b
commit b108ac6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/pkg/ddevapp/ddevapp.go b/pkg/ddevapp/ddevapp.go
@@ -686,23 +686,24 @@ func (app *DdevApp) Logs(service string, follow bool, timestamps bool, tailLines
 // DockerEnv sets environment variables for a docker-compose run.
 func (app *DdevApp) DockerEnv() {
 	envVars := map[string]string{
-		"COMPOSE_PROJECT_NAME":   "ddev-" + app.Name,
-		"DDEV_SITENAME":          app.Name,
-		"DDEV_DBIMAGE":           app.DBImage,
-		"DDEV_DBAIMAGE":          app.DBAImage,
-		"DDEV_WEBIMAGE":          app.WebImage,
-		"DDEV_APPROOT":           app.AppRoot,
-		"DDEV_DOCROOT":           app.Docroot,
-		"DDEV_DATADIR":           app.DataDir,
-		"DDEV_IMPORTDIR":         app.ImportDir,
-		"DDEV_URL":               app.GetHTTPURL(),
-		"DDEV_HOSTNAME":          app.HostName(),
-		"DDEV_UID":               "",
-		"DDEV_GID":               "",
-		"DDEV_PHP_VERSION":       app.PHPVersion,
-		"DDEV_PROJECT_TYPE":      app.Type,
-		"DDEV_ROUTER_HTTP_PORT":  app.RouterHTTPPort,
-		"DDEV_ROUTER_HTTPS_PORT": app.RouterHTTPSPort,
+		"COMPOSE_PROJECT_NAME":          "ddev-" + app.Name,
+		"COMPOSE_CONVERT_WINDOWS_PATHS": "true",
+		"DDEV_SITENAME":                 app.Name,
+		"DDEV_DBIMAGE":                  app.DBImage,
+		"DDEV_DBAIMAGE":                 app.DBAImage,
+		"DDEV_WEBIMAGE":                 app.WebImage,
+		"DDEV_APPROOT":                  app.AppRoot,
+		"DDEV_DOCROOT":                  app.Docroot,
+		"DDEV_DATADIR":                  app.DataDir,
+		"DDEV_IMPORTDIR":                app.ImportDir,
+		"DDEV_URL":                      app.GetHTTPURL(),
+		"DDEV_HOSTNAME":                 app.HostName(),
+		"DDEV_UID":                      "",
+		"DDEV_GID":                      "",
+		"DDEV_PHP_VERSION":              app.PHPVersion,
+		"DDEV_PROJECT_TYPE":             app.Type,
+		"DDEV_ROUTER_HTTP_PORT":         app.RouterHTTPPort,
+		"DDEV_ROUTER_HTTPS_PORT":        app.RouterHTTPSPort,
 	}
 	if runtime.GOOS == "linux" {
 		curUser, err := user.Current()

diff --git a/pkg/testcommon/testcommon.go b/pkg/testcommon/testcommon.go
@@ -225,6 +225,7 @@ func CaptureStdOut() func() string {
 func ClearDockerEnv() {
 	envVars := []string{
 		"COMPOSE_PROJECT_NAME",
+		"COMPOSE_CONVERT_WINDOWS_PATHS",
 		"DDEV_SITENAME",
 		"DDEV_DBIMAGE",
 		"DDEV_WEBIMAGE",