Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use less permissive types in the config monoids (#2267) #2294

Merged
Prev Previous commit
Next Next commit
Constrain type for imgDockerAdd
  • Loading branch information
sjakobi committed Jul 21, 2016
commit 5dc525d310ffdc65faaf64e93e6f71ce70095b55
3 changes: 1 addition & 2 deletions src/Stack/Image.hs
Original file line number Diff line number Diff line change
@@ -114,9 +114,8 @@ syncAddContentToDir opts dir = do
let imgAdd = imgDockerAdd opts
forM_
(Map.toList imgAdd)
(\(source,dest) ->
(\(source,destPath) ->
do sourcePath <- resolveDir (bcRoot bconfig) source
destPath <- parseAbsDir dest
let destFullPath = dir </> dropRoot destPath
ensureDir destFullPath
copyDirRecur sourcePath destFullPath)
2 changes: 1 addition & 1 deletion src/Stack/Types/Image.hs
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ data ImageDockerOpts = ImageDockerOpts
, imgDockerEntrypoints :: !(Maybe [String])
-- ^ Maybe have a specific ENTRYPOINT list that will be used to
-- create images.
, imgDockerAdd :: !(Map FilePath FilePath)
, imgDockerAdd :: !(Map FilePath (Path Abs Dir))
-- ^ Maybe have some static project content to include in a
-- specific directory in all the images.
, imgDockerImageName :: !(Maybe String)