Adding a couple helper functions to work with file sources

README.md

@@ -110,15 +110,17 @@ import           Language.Docker
 import qualified System.Directory     as Directory
 import qualified System.FilePath      as FilePath
 import qualified System.FilePath.Glob as Glob
-import Data.String (fromString)
+import Data.List.NonEmpty (fromList)
+
 main = do
     str <- toDockerfileStrIO $ do
         fs <- liftIO $ do
             cwd <- Directory.getCurrentDirectory
             fs <- Glob.glob "./test/*.hs"
-            return (map (FilePath.makeRelative cwd) fs)
+	    let relativeFiles = map (FilePath.makeRelative cwd) fs
+            return (fromList relativeFiles)
         from "ubuntu"
-	mapM_ (\f -> add [fromString f] (fromString $ "/app/" ++ takeFileName f)) fs
+	copy $ (toSources fs) `to` "/app/"
     putStr str
 ```
 

src/Language/Docker.hs

@@ -29,6 +29,8 @@ module Language.Docker
     , Language.Docker.EDSL.to
     , Language.Docker.EDSL.fromStage
     , Language.Docker.EDSL.ownedBy
+    , Language.Docker.EDSL.toSources
+    , Language.Docker.EDSL.toTarget
     , Language.Docker.EDSL.run
     , Language.Docker.EDSL.runArgs
     , Language.Docker.EDSL.cmd

src/Language/Docker/EDSL.hs

@@ -105,11 +105,11 @@ toDockerfileStr = PrettyPrint.prettyPrint . toDockerfile
 untagged :: String -> EBaseImage
 untagged = flip EUntaggedImage Nothing . fromString
 
-tagged :: String -> String -> EBaseImage
-tagged imageName tag = ETaggedImage (fromString imageName) tag Nothing
+tagged :: Syntax.Image -> String -> EBaseImage
+tagged imageName tag = ETaggedImage imageName tag Nothing
 
-digested :: String -> ByteString -> EBaseImage
-digested imageName hash = EDigestedImage (fromString imageName) hash Nothing
+digested :: Syntax.Image -> ByteString -> EBaseImage
+digested imageName hash = EDigestedImage imageName hash Nothing
 
 aliased :: EBaseImage -> String -> EBaseImage
 aliased image alias =
@@ -156,6 +156,12 @@ copyFromStage stage source dest = copy $ Syntax.CopyArgs source dest Syntax.NoCh
 add :: MonadFree EInstruction m => NonEmpty Syntax.SourcePath -> Syntax.TargetPath -> m ()
 add sources dest = addArgs sources dest Syntax.NoChown
 
+toSources :: NonEmpty String -> NonEmpty Syntax.SourcePath
+toSources = fmap Syntax.SourcePath
+
+toTarget :: String -> Syntax.TargetPath
+toTarget = Syntax.TargetPath
+
 fromStage :: Syntax.CopyArgs -> Syntax.CopySource -> Syntax.CopyArgs
 fromStage args src = args {Syntax.sourceFlag = src}