Skip to content

Commit bbda3b1

Browse files
committed
Fix --docker with STACK_YAML for Windows.
1 parent b2b4d83 commit bbda3b1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Stack/Docker.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ runContainerAndExit = do
263263
,"-v",toFilePathNoTrailingSep stackRoot ++ ":" ++ toLinuxStylePath (toFilePathNoTrailingSep stackRoot ++ mountSuffix)
264264
,"-v",toFilePathNoTrailingSep projectRoot ++ ":" ++ toLinuxStylePath (toFilePathNoTrailingSep projectRoot ++ mountSuffix)
265265
,"-v",toFilePathNoTrailingSep sandboxHomeDir ++ ":" ++ toLinuxStylePath (toFilePathNoTrailingSep sandboxHomeDir ++ mountSuffix)
266-
,"-w", toLinuxStylePath (toFilePathNoTrailingSep pwd)]
266+
,"-w",toLinuxStylePath (toFilePathNoTrailingSep pwd)]
267267
,case dockerNetwork docker of
268268
Nothing -> ["--net=host"]
269269
Just name -> ["--net=" ++ name]
@@ -278,8 +278,8 @@ runContainerAndExit = do
278278
,case mstackYaml of
279279
Nothing -> []
280280
Just stackYaml ->
281-
["-e","STACK_YAML=" ++ stackYaml
282-
,"-v",stackYaml++ ":" ++ stackYaml ++ ":ro"]
281+
["-e","STACK_YAML=" ++ toLinuxStylePath stackYaml
282+
,"-v",stackYaml ++ ":" ++ toLinuxStylePath stackYaml ++ ":ro"]
283283
-- Disable the deprecated entrypoint in FP Complete-generated images
284284
,["--entrypoint=/usr/bin/env"
285285
| isJust (lookupImageEnv oldSandboxIdEnvVar imageEnvVars) &&

0 commit comments

Comments
 (0)