From e2512c198daf620ace4cbea0e9cb8cd34cff0744 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 4 Apr 2014 15:14:53 -0400 Subject: propellor spin --- Propellor/Property/Docker.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Propellor') diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 9ab47279..87b111bd 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -231,7 +231,7 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci if runningident == Just ident then return NoChange else do - print ["container parameters changed"] + error "container parameters changed" void $ stopContainer cid oldimage <- fromMaybe image <$> commitContainer cid void $ removeContainer cid @@ -248,7 +248,7 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci return . extractident extractident :: [Resp] -> Maybe ContainerIdent - extractident = headMaybe . catMaybes . map readish . catMaybes . map getStdout + extractident = headMaybe . catMaybes . map (readish :: String -> Maybe ContainerIdent) . catMaybes . map getStdout runps = getRunParams $ containerprops ++ -- expose propellor directory inside the container -- cgit v1.2.3