summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 15:15:56 -0400
committerJoey Hess2014-04-04 15:15:56 -0400
commitfd1b037d452b7e9ea58beb86eb26ea397f64c28c (patch)
treef385ddbfb3ea90984437f245c2200ff0197e8c55
parente2512c198daf620ace4cbea0e9cb8cd34cff0744 (diff)
propellor spin
-rw-r--r--Propellor/Property/Docker.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index 87b111bd..0c52078c 100644
--- a/Propellor/Property/Docker.hs
+++ b/Propellor/Property/Docker.hs
@@ -244,8 +244,9 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci
ident = ContainerIdent image hn cn runps
getrunningident :: IO (Maybe ContainerIdent)
- getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $
- return . extractident
+ 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