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

remove unnecessary use of ensureProperty

This commit is contained in:
Joey Hess 2015-05-24 17:12:17 -04:00
parent b68b9ee165
commit 3a99c87cdf
Failed to extract signature
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Propellor/Property/Docker.hs
View File

@ -426,16 +426,14 @@ runningContainer cid@(ContainerId hn cn) image runps = containerDesc cid $ prope
retry (n-1) a retry (n-1) a
_ -> return v _ -> return v
go img = do go img = liftIO $ do
liftIO $ do clearProvisionedFlag cid
clearProvisionedFlag cid createDirectoryIfMissing True (takeDirectory $ identFile cid)
createDirectoryIfMissing True (takeDirectory $ identFile cid) shim <- Shim.setup (localdir </> "propellor") Nothing (localdir </> shimdir cid)
shim <- liftIO $ Shim.setup (localdir </> "propellor") Nothing (localdir </> shimdir cid) writeFile (identFile cid) (show ident)
liftIO $ writeFile (identFile cid) (show ident) toResult <$> runContainer img
ensureProperty $ property "run" $ liftIO $ (runps ++ ["-i", "-d", "-t"])
toResult <$> runContainer img [shim, "--continue", show (DockerInit (fromContainerId cid))]
(runps ++ ["-i", "-d", "-t"])
[shim, "--continue", show (DockerInit (fromContainerId cid))]
-- | Called when propellor is running inside a docker container. -- | Called when propellor is running inside a docker container.
-- The string should be the container's ContainerId. -- The string should be the container's ContainerId.