Fix relative converted paths in windows

Signed-off-by: Ulysses Souza <[email protected]>

Author: ulyssessouza

cli/options.go

@@ -365,6 +365,7 @@ func withNamePrecedenceLoad(absWorkingDir string, options *ProjectOptions) func(
 func withConvertWindowsPaths(options *ProjectOptions) func(*loader.Options) {
 	return func(o *loader.Options) {
 		o.ConvertWindowsPaths = utils.StringToBool(options.Environment["COMPOSE_CONVERT_WINDOWS_PATHS"])
+		o.ResolvePaths = true
 	}
 }
 

cli/options_windows_test.go

@@ -26,10 +26,15 @@ import (
 func TestConvertWithEnvVar(t *testing.T) {
 	os.Setenv("COMPOSE_CONVERT_WINDOWS_PATHS", "1")
 	defer os.Unsetenv("COMPOSE_CONVERT_WINDOWS_PATHS")
-	opts, _ := NewProjectOptions([]string{"testdata/simple/compose-with-paths.yaml"}, WithOsEnv)
+	opts, _ := NewProjectOptions([]string{"testdata/simple/compose-with-paths.yaml"},
+		WithOsEnv,
+		WithWorkingDirectory("C:\\\\"))
 
 	p, err := ProjectFromOptions(opts)
 
 	assert.NilError(t, err)
+	assert.Equal(t, len(p.Services[0].Volumes), 3)
 	assert.Equal(t, p.Services[0].Volumes[0].Source, "/c/docker/project")
+	assert.Equal(t, p.Services[0].Volumes[1].Source, "/c/relative")
+	assert.Equal(t, p.Services[0].Volumes[2].Source, "/c/relative2")
 }

cli/testdata/simple/compose-with-paths.yaml

@@ -5,3 +5,7 @@ services:
     - type: bind
       source: C:\docker\project
       target: /test
+    - type: bind
+      source: ./relative
+      target: /test-relative
+    - ./relative2:/test-relative2

loader/loader.go

@@ -574,7 +574,7 @@ func LoadService(name string, serviceDict map[string]interface{}, workingDir str
 			return nil, errors.New(`invalid mount config for type "bind": field Source must not be empty`)
 		}
 
-		if resolvePaths {
+		if resolvePaths || convertPaths {
 			volume = resolveVolumePath(volume, workingDir, lookupEnv)
 		}