Skip to content

Commit 5dc525d

Browse files
committed
Constrain type for imgDockerAdd
1 parent 8419663 commit 5dc525d

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

src/Stack/Image.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@ syncAddContentToDir opts dir = do
114114
let imgAdd = imgDockerAdd opts
115115
forM_
116116
(Map.toList imgAdd)
117-
(\(source,dest) ->
117+
(\(source,destPath) ->
118118
do sourcePath <- resolveDir (bcRoot bconfig) source
119-
destPath <- parseAbsDir dest
120119
let destFullPath = dir </> dropRoot destPath
121120
ensureDir destFullPath
122121
copyDirRecur sourcePath destFullPath)

src/Stack/Types/Image.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ data ImageDockerOpts = ImageDockerOpts
3030
, imgDockerEntrypoints :: !(Maybe [String])
3131
-- ^ Maybe have a specific ENTRYPOINT list that will be used to
3232
-- create images.
33-
, imgDockerAdd :: !(Map FilePath FilePath)
33+
, imgDockerAdd :: !(Map FilePath (Path Abs Dir))
3434
-- ^ Maybe have some static project content to include in a
3535
-- specific directory in all the images.
3636
, imgDockerImageName :: !(Maybe String)

0 commit comments

Comments
 (0)