From 2b687fbca387c56b97f2313fedac4ec75a58d87b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 8 Apr 2014 00:49:49 -0400 Subject: [PATCH] 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 888e76c..784b113 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -18,6 +18,7 @@ import Utility.Path import Control.Concurrent.Async import System.Posix.Directory import Data.List +import Data.List.Utils -- | Configures docker with an authentication file, so that images can be -- pushed to index.docker.io. @@ -372,7 +373,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