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

improve UI when exiting shell in docker container

This commit is contained in:
Joey Hess 2014-04-01 15:38:32 -04:00
parent d1135ba87d
commit 8c6d07fd2c
Failed to extract signature
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Propellor/Property/Docker.hs
View File

@ -185,12 +185,13 @@ chain s = case readish s of
Just ident@(ContainerIdent _image hn cn _rp) -> do Just ident@(ContainerIdent _image hn cn _rp) -> do
let cid = ContainerId hn cn let cid = ContainerId hn cn
writeFile propellorIdent (show ident) writeFile propellorIdent (show ident)
t <- async $ simpleSh $ namedPipe cid void $ async $ simpleSh $ namedPipe cid
void $ ifM (inPath "bash") forever $ do
( boolSystem "bash" [Param "-l"] void $ ifM (inPath "bash")
, boolSystem "/bin/sh" [] ( boolSystem "bash" [Param "-l"]
) , boolSystem "/bin/sh" []
wait t )
putStrLn "Container is still running. Press ^P^Q to detach."
-- | Once a container is running, propellor can be run inside -- | Once a container is running, propellor can be run inside
-- it to provision it. -- it to provision it.