remove --docker; use Continue
And --chain was already not used.
This commit is contained in:
parent
34cbe738b7
commit
2bbb2aa6e2
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue