diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-04 15:58:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-04 15:58:48 -0400 |
| commit | 075a8eac5b66f0da4e7054002155ebfddde38f7f (patch) | |
| tree | ea0a9b7c5d37d82751ca1d17c6b85090cb335bba | |
| parent | 68ed5153aa3f8a0e50952120c3dbb2386a067ee3 (diff) | |
propellor spin
| -rw-r--r-- | Propellor/Property/Docker.hs | 9 | ||||
| -rw-r--r-- | debian/changelog | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 107c542e..6be8c4e2 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE RankNTypes, BangPatterns #-} -- | Docker support for propellor -- @@ -227,7 +227,6 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci -- parameters of the container differ and it must -- be restarted. runningident <- getrunningident - print runningident if runningident == Just ident then return NoChange else do @@ -247,11 +246,11 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci getrunningident :: IO (Maybe ContainerIdent) getrunningident = simpleShClient (namedPipe cid) "cat" [propellorIdent] $ \rs -> do - print (extractident rs) - return $ extractident rs + let !v = extractident rs + return v extractident :: [Resp] -> Maybe ContainerIdent - extractident = headMaybe . catMaybes . map (readish :: String -> Maybe ContainerIdent) . catMaybes . map getStdout + extractident = headMaybe . catMaybes . map readish . catMaybes . map getStdout runps = getRunParams $ containerprops ++ -- expose propellor directory inside the container diff --git a/debian/changelog b/debian/changelog index f4eadd22..0fdd42b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +propellor (0.2.3) UNRELEASED; urgency=medium + + * docker: Fix laziness bug that caused running containers to be + unnecessarily stopped and committed. + + -- Joey Hess <joeyh@debian.org> Fri, 04 Apr 2014 15:58:03 -0400 + propellor (0.2.2) unstable; urgency=medium * Now supports provisioning docker containers with architecture/libraries |