From d96bc41d068b9f47273fdc9ca2f127d9ebc9d1f9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Apr 2014 14:45:31 -0400 Subject: [PATCH] propellor spin --- Propellor/Property/Docker.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 6113a29..7a605b0 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -224,7 +224,6 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci if cid `elem` l then do runningident <- getrunningident - print (runningident, ident2id <$> runningident, ident, ident2id ident) if (ident2id <$> runningident) == Just (ident2id ident) then return NoChange else do @@ -240,8 +239,10 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci ident = ContainerIdent image hn cn runps getrunningident = catchDefaultIO Nothing $ - simpleShClient (namedPipe cid) "cat" [propellorIdent] $ - pure . headMaybe . catMaybes . map readish . catMaybes . map getStdout + simpleShClient (namedPipe cid) "cat" [propellorIdent] $ \vs -> do + print vs + -- pure . headMaybe . catMaybes . map readish . catMaybes . map getStdout + return Nothing runps = getRunParams $ containerprops ++ -- expose propellor directory inside the container