From 8c6d07fd2c9a65940af872bc89293732a6f69964 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Apr 2014 15:38:32 -0400 Subject: improve UI when exiting shell in docker container --- Propellor/Property/Docker.hs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 62bb0017..577c837a 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -185,12 +185,13 @@ chain s = case readish s of Just ident@(ContainerIdent _image hn cn _rp) -> do let cid = ContainerId hn cn writeFile propellorIdent (show ident) - t <- async $ simpleSh $ namedPipe cid - void $ ifM (inPath "bash") - ( boolSystem "bash" [Param "-l"] - , boolSystem "/bin/sh" [] - ) - wait t + void $ async $ simpleSh $ namedPipe cid + forever $ do + void $ ifM (inPath "bash") + ( boolSystem "bash" [Param "-l"] + , boolSystem "/bin/sh" [] + ) + putStrLn "Container is still running. Press ^P^Q to detach." -- | Once a container is running, propellor can be run inside -- it to provision it. -- cgit v1.2.3