summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-04 15:14:53 -0400
committerJoey Hess2014-04-04 15:14:53 -0400
commite2512c198daf620ace4cbea0e9cb8cd34cff0744 (patch)
treeb8e914add8786b37f64e7da6ddd28e58fed94499 /Propellor/Property
parentbf6a7b5b7b7271d4cd82fade27bc8e8cd1fae4c6 (diff)
propellor spin
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/Docker.hs4
1 files changed, 2 insertions, 2 deletions
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