Change the CLI to take the languages folder

src/Myriad.hs

@@ -13,9 +13,9 @@ import Myriad.Core
 import Myriad.Docker
 import Myriad.Server
 
-runMyriadServer :: T.Text -> IO ()
-runMyriadServer configInput = do
-    env <- initEnv configInput
+runMyriadServer :: T.Text -> T.Text -> IO ()
+runMyriadServer configInput languagesDir = do
+    env <- initEnv configInput languagesDir
     runMyriadT env do
         buildAllImages
         startCleanup

src/Myriad/Core.hs

@@ -49,6 +49,7 @@ data EvalResult = EvalOk BL.ByteString | EvalTimedOut | EvalErrored
 
 data Env = Env
     { config :: MyriadConfig
+    , languagesDir :: T.Text
     , containers :: MVar (M.Map Language ContainerName)
     , containerSems :: MVar (M.Map Language QSem)
     , evalSems :: MVar (M.Map Language QSem)
@@ -61,7 +62,6 @@ data MyriadConfig = MyriadConfig
     , prepareContainers :: Bool
     , cleanupInterval :: Natural
     , port :: Natural
-    , languagesDir :: T.Text
     } deriving (Show, Generic)
 
 instance Interpret MyriadConfig
@@ -112,10 +112,11 @@ type Myriadic m = (MonadReader Env m, MonadLogger m, MonadLoggerIO m, MonadIO m,
 readConfig :: T.Text -> IO MyriadConfig
 readConfig = input auto
 
-initEnv :: T.Text -> IO Env
-initEnv configInput =
+initEnv :: T.Text -> T.Text -> IO Env
+initEnv configInput languagesDir =
         Env
     <$> readConfig configInput
+    <*> pure languagesDir
     <*> newMVar M.empty
     <*> newMVar M.empty
     <*> newMVar M.empty

src/Myriad/Docker.hs

@@ -27,7 +27,7 @@ import Myriad.Core
 
 buildImage :: Myriadic m => LanguageConfig -> m ()
 buildImage lang@LanguageConfig { name, concurrent } = do
-    MyriadConfig { prepareContainers, languagesDir } <- asks config
+    Env { config = MyriadConfig { prepareContainers }, languagesDir } <- ask
     logInfo ["Building image ", cs $ imageName lang]
     exec_ ["docker build -t ", imageName lang, " ", cs languagesDir </> cs name]
     setupQSems