docker linked containers can have multiple names, separated by ','

Look at the name that contains a containerid

1 files changed, 3 insertions, 1 deletions

diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index 07c49b47..50a816d1 100644
--- a/Propellor/Property/Docker.hs
+++ b/Propellor/Property/Docker.hs
@@ -19,6 +19,7 @@ import Control.Concurrent.Async
 import System.Posix.Directory
 import System.Posix.Process
 import Data.List
+import Data.List.Utils
 
 -- | Configures docker with an authentication file, so that images can be
 -- pushed to index.docker.io.
@@ -390,7 +391,8 @@ data ContainerFilter = RunningContainers | AllContainers
 -- | Only lists propellor managed containers.
 listContainers :: ContainerFilter -> IO [ContainerId]
 listContainers status = 
-	catMaybes . map toContainerId . catMaybes . map (lastMaybe . words) . lines
+	catMaybes . map toContainerId . concat . map (split ",")
+		. catMaybes . map (lastMaybe . words) . lines
 		<$> readProcess dockercmd ps
   where
 	ps