summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 14:45:31 -0400
committerJoey Hess2014-04-04 14:45:31 -0400
commitd96bc41d068b9f47273fdc9ca2f127d9ebc9d1f9 (patch)
tree6c42f11ac0b420aaa3939166db150fc704bb9bcb /Propellor/Property
parent5849f43422db95e8219093ff8785a70ba8392dd6 (diff)
propellor spin
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/Docker.hs7
1 files changed, 4 insertions, 3 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index 6113a294..7a605b02 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