summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoey Hess2014-11-18 18:49:32 -0400
committerJoey Hess2014-11-18 18:52:00 -0400
commit2bbb2aa6e2be7152f9532fb45a098b816a92217b (patch)
tree562249e3d1649e8dd28b66b0eda6d457451a60a3 /src
parent34cbe738b7e1fc38fa26eeb0cc9f203f5f429fae (diff)
remove --docker; use Continue
And --chain was already not used.
Diffstat (limited to 'src')
-rw-r--r--src/Propellor/CmdLine.hs3
-rw-r--r--src/Propellor/Property/Docker.hs2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index 8220cbe2..df4d44a6 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -51,9 +51,6 @@ processCmdLine = go =<< getArgs
go ("--continue":s:[]) = case readish s of
Just cmdline -> return $ Continue cmdline
Nothing -> errorMessage "--continue serialization failure"
- go ("--chain":h:[]) = return $ Chain h False
- go ("--chain":h:b:[]) = return $ Chain h (Prelude.read b)
- go ("--docker":h:[]) = return $ Docker h
go (h:[])
| "--" `isPrefixOf` h = usage
| otherwise = return $ Run h
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index d005592e..491955dd 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -385,7 +385,7 @@ runningContainer cid@(ContainerId hn cn) image runps = containerDesc cid $ prope
liftIO $ writeFile (identFile cid) (show ident)
ensureProperty $ boolProperty "run" $ runContainer img
(runps ++ ["-i", "-d", "-t"])
- [shim, "--docker", fromContainerId cid]
+ [shim, "--continue", show (Docker (fromContainerId cid))]
-- | Called when propellor is running inside a docker container.
-- The string should be the container's ContainerId.