cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

typo

This commit is contained in:
Joey Hess 2014-04-01 13:06:50 -04:00
parent 2d4a0f760b
commit ff4bc019cf
Failed to extract signature
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Propellor/Property/Docker.hs
View File

@ -121,7 +121,7 @@ ensureContainer cid@(ContainerId hn cn) image containerprops = do
-- Start the simplesh server that will be used by propellor -- Start the simplesh server that will be used by propellor
-- to run commands in the container. An interactive shell -- to run commands in the container. An interactive shell
-- is also started, so the user can attach and use it if desired. -- is also started, so the user can attach and use it if desired.
startsimplesh = ["sh" ++ "-c" ++ "./propellor --simplesh " ++ namedPipe cid ++ " & ; bash -l"] startsimplesh = ["sh", "-c", "./propellor --simplesh " ++ namedPipe cid ++ " & ; bash -l"]
getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $ getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $
pure . headMaybe . catMaybes . map readish . catMaybes . map getStdout pure . headMaybe . catMaybes . map readish . catMaybes . map getStdout
@ -189,8 +189,8 @@ stopContainer :: ContainerId -> IO Bool
stopContainer cid = boolSystem dockercmd [Param "stop", Param $ fromContainerId cid ] stopContainer cid = boolSystem dockercmd [Param "stop", Param $ fromContainerId cid ]
removeContainer :: ContainerId -> IO () removeContainer :: ContainerId -> IO ()
removeContainer cid = void $ boolSystem "sh" removeContainer cid = void $ catchMaybeIO $
[Param "-c", Param $ dockercmd ++ " rm " ++ fromContainerId cid ] readProcess "sh" [Param "-c", Param $ dockercmd ++ " rm " ++ fromContainerId cid ]
runContainer :: Image -> [RunParam] -> [String] -> IO Bool runContainer :: Image -> [RunParam] -> [String] -> IO Bool
runContainer image ps cmd = boolSystem dockercmd $ map Param $ runContainer image ps cmd = boolSystem dockercmd $ map Param $