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 14:45:31 -04:00
parent 5849f43422
commit d96bc41d06
Failed to extract signature
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Propellor/Property/Docker.hs
View File

@ -224,7 +224,6 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci
if cid `elem` l if cid `elem` l
then do then do
runningident <- getrunningident runningident <- getrunningident
print (runningident, ident2id <$> runningident, ident, ident2id ident)
if (ident2id <$> runningident) == Just (ident2id ident) if (ident2id <$> runningident) == Just (ident2id ident)
then return NoChange then return NoChange
else do else do
@ -240,8 +239,10 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci
ident = ContainerIdent image hn cn runps ident = ContainerIdent image hn cn runps
getrunningident = catchDefaultIO Nothing $ getrunningident = catchDefaultIO Nothing $
simpleShClient (namedPipe cid) "cat" [propellorIdent] $ simpleShClient (namedPipe cid) "cat" [propellorIdent] $ \vs -> do
pure . headMaybe . catMaybes . map readish . catMaybes . map getStdout print vs
-- pure . headMaybe . catMaybes . map readish . catMaybes . map getStdout
return Nothing
runps = getRunParams $ containerprops ++ runps = getRunParams $ containerprops ++
-- expose propellor directory inside the container -- expose propellor directory inside the container