From 4f8e8077e00ea8c1d0bda199261a0239eed36959 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Apr 2014 00:49:49 -0400 Subject: docker linked containers can have multiple names, separated by ',' Look at the name that contains a containerid --- Propellor/Property/Docker.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3