From e6d24b49b87de312776bee71a2a6f009f7f397a9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Apr 2014 16:58:11 -0400 Subject: various improvements --- Propellor/Property/Docker.hs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Propellor/Property/Docker.hs') diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 577c837a..97253a7f 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -99,12 +99,12 @@ containerDesc cid p = p `describe` desc -- | Ensures that a docker container is set up and running. The container -- has its own Properties which are handled by running propellor -- inside the container. -hasContainer - :: HostName +docked + :: (HostName -> ContainerName -> Maybe (Container)) + -> HostName -> ContainerName - -> (HostName -> ContainerName -> Maybe (Container)) -> Property -hasContainer hn cn findcontainer = +docked findcontainer hn cn = case findcontainer hn cn of Nothing -> containerDesc cid $ Property "" $ do warningMessage $ "missing definition for docker container \"" ++ fromContainerId cid -- cgit v1.3-2-g0d8e