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

fix chaining into docker

This commit is contained in:
Joey Hess 2014-04-01 13:58:15 -04:00
parent 79cbdf35b1
commit d73dd30044
Failed to extract signature
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Propellor/Property/Docker.hs
View File

@ -121,11 +121,6 @@ runningContainer cid@(ContainerId hn cn) image containerprops = Property (contai
where where
ident = ContainerIdent image hn cn runps ident = ContainerIdent image hn cn runps
-- Start the simplesh server that will be used by propellor
-- to run commands in the container. An interactive shell
-- is also started, so the user can attach and use it if desired.
startsimplesh = ["sh", "-c", "./propellor --simplesh " ++ namedPipe cid ++ " & bash -l"]
getrunningident = catchDefaultIO Nothing $ getrunningident = catchDefaultIO Nothing $
simpleShClient (namedPipe cid) "cat" [propellorIdent] $ simpleShClient (namedPipe cid) "cat" [propellorIdent] $
pure . headMaybe . catMaybes . map readish . catMaybes . map getStdout pure . headMaybe . catMaybes . map readish . catMaybes . map getStdout
@ -140,7 +135,9 @@ runningContainer cid@(ContainerId hn cn) image containerprops = Property (contai
, workdir localdir , workdir localdir
] ]
go img = ifM (runContainer img (runps ++ ["-i", "-d", "-t"]) startsimplesh) chaincmd = ["./propellor", show $ ChainDocker $ show ident]
go img = ifM (runContainer img (runps ++ ["-i", "-d", "-t"]) chaincmd)
( return MadeChange ( return MadeChange
, return FailedChange , return FailedChange
) )