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

propellor spin

This commit is contained in:
Joey Hess 2014-04-04 15:26:16 -04:00
parent bbca48d44b
commit b9e7721db0
Failed to extract signature
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Propellor/Property/Docker.hs
View File

@ -236,15 +236,24 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci
oldimage <- fromMaybe image <$> commitContainer cid
void $ removeContainer cid
go oldimage
else go image
else do
ifM (elem cid <$> listContainers AllContainers)
( do
-- Contaner may be stopped, or
-- may not exist.
void $ stopContainer cid
oldimage <- fromMaybe image <$> commitContainer cid
void $ removeContainer cid
go oldimage
, go image
)
where
ident = ContainerIdent image hn cn runps
getrunningident :: IO (Maybe ContainerIdent)
getrunningident = catchDefaultIO Nothing $
simpleShClient (namedPipe cid) "cat" [propellorIdent] $ \rs -> do
print (rs, extractident rs)
return $ extractident rs
getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $ \rs -> do
print (rs, extractident rs)
return $ extractident rs
extractident :: [Resp] -> Maybe ContainerIdent
extractident = headMaybe . catMaybes . map (readish :: String -> Maybe ContainerIdent) . catMaybes . map getStdout