Separate lib and exe; add languageDir setting

src/Main.hs

@@ -1,35 +0,0 @@
-module Main where
-
-import qualified Data.Text as T
-import Options.Applicative
-
-import Network.Wai.Handler.Warp (run)
-
-import Myriad.Core
-import Myriad.Docker
-import Myriad.Server
-
-data Args = Args
-    { configInput :: T.Text
-    }
-
-parseArgs :: IO Args
-parseArgs = execParser $ info (helper <*> args) (fullDesc <> progDesc "Run the Myriad server")
-    where
-        args = Args <$> option str (mconcat
-            [ long "config"
-            , short 'c'
-            , help "Sets the Dhall configuration"
-            , metavar "DHALL"
-            ])
-
-main :: IO ()
-main = do
-    Args { configInput } <- parseArgs
-    env <- initEnv configInput
-    runMyriadT env do
-        buildAllImages
-        startCleanup
-        logInfo ["Finished Docker-related setup"]
-        logInfo ["Starting server"]
-    run (fromIntegral . port . config $ env) $ app env

src/Myriad.hs

@@ -0,0 +1,21 @@
+module Myriad
+    ( runMyriadServer
+    ) where
+
+import qualified Data.Text as T
+
+import Network.Wai.Handler.Warp (run)
+
+import Myriad.Core
+import Myriad.Docker
+import Myriad.Server
+
+runMyriadServer :: T.Text -> IO ()
+runMyriadServer configInput = do
+    env <- initEnv configInput
+    runMyriadT env do
+        buildAllImages
+        startCleanup
+        logInfo ["Finished Docker-related setup"]
+        logInfo ["Starting server"]
+    run (fromIntegral . port . config $ env) $ app env

src/Myriad/Core.hs

@@ -61,6 +61,7 @@ data MyriadConfig = MyriadConfig
     , prepareContainers :: Bool
     , cleanupInterval :: Natural
     , port :: Natural
+    , languagesDir :: T.Text
     } deriving (Show, Generic)
 
 instance Interpret MyriadConfig

src/Myriad/Docker.hs

@@ -20,17 +20,18 @@ import Control.Concurrent.Lifted (fork, threadDelay)
 import Control.Concurrent.MVar.Lifted
 import Control.Concurrent.QSem.Lifted
 import Control.Exception.Lifted
+import System.FilePath ((</>))
 import System.Process.Typed
 
 import Myriad.Core
 
 buildImage :: Myriadic m => LanguageConfig -> m ()
 buildImage lang@LanguageConfig { name, concurrent } = do
+    MyriadConfig { prepareContainers, languagesDir } <- asks config
     logInfo ["Building image ", cs $ imageName lang]
-    exec_ ["docker build -t ", imageName lang, " ./languages/", cs name]
+    exec_ ["docker build -t ", imageName lang, " ", cs languagesDir </> cs name]
     setupQSems
     logInfo ["Built image ", cs $ imageName lang]
-    MyriadConfig { prepareContainers } <- asks config
     when_ prepareContainers $ setupContainer lang
     where
         setupQSems :: Myriadic m => m ()