From 668cc936e4bd1596fbae4246ac4bacb240383393 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Apr 2014 20:34:26 -0400 Subject: [PATCH] avoid unnecessary rebuid of container --- Propellor/Property/Docker.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 0207f34..a18155e 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -123,7 +123,7 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci if cid `elem` l then do runningident <- getrunningident - if runningident == Just ident + if ident2id <$> runningident == Just (ident2id ident) then return NoChange else do void $ stopContainer cid @@ -162,6 +162,9 @@ runningContainer cid@(ContainerId hn cn) image containerprops = containerDesc ci data ContainerIdent = ContainerIdent Image HostName ContainerName [RunParam] deriving (Read, Show, Eq) +ident2id :: ContainerIdent -> ContainerId +ident2id (ContainerIdent _ hn cn _) = ContainerId hn cn + -- | The ContainerIdent of a container is written to -- /.propellor-ident inside it. This can be checked to see if -- the container has the same ident later.