summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Chroot.hs2
-rw-r--r--src/Propellor/Property/Docker.hs7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs
index 0cbc8642..b059e3eb 100644
--- a/src/Propellor/Property/Chroot.hs
+++ b/src/Propellor/Property/Chroot.hs
@@ -83,7 +83,7 @@ provisioned' propigator c@(Chroot loc system builderconf _) systemdonly =
teardown = toProp (revert built)
propigateChrootInfo :: (IsProp (Property i)) => Chroot -> Property i -> Property HasInfo
-propigateChrootInfo c p = propigateContainer c p'
+propigateChrootInfo c@(Chroot location _ _ _) p = propigateContainer location c p'
where
p' = infoProperty
(propertyDesc p)
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 9cfc24b6..e6365276 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -19,7 +19,7 @@ module Propellor.Property.Docker (
Image(..),
latestImage,
ContainerName,
- Container,
+ Container(..),
HasImage(..),
-- * Container configuration
dns,
@@ -171,7 +171,7 @@ imagePulled ctr = describe pulled msg
image = getImageName ctr
propigateContainerInfo :: (IsProp (Property i)) => Container -> Property i -> Property HasInfo
-propigateContainerInfo ctr@(Container _ h) p = propigateContainer ctr p'
+propigateContainerInfo ctr@(Container _ h) p = propigateContainer cn ctr p'
where
p' = infoProperty
(propertyDesc p)
@@ -179,7 +179,8 @@ propigateContainerInfo ctr@(Container _ h) p = propigateContainer ctr p'
(propertyInfo p <> dockerinfo)
(propertyChildren p)
dockerinfo = dockerInfo $
- mempty { _dockerContainers = M.singleton (hostName h) h }
+ mempty { _dockerContainers = M.singleton cn h }
+ cn = hostName h
mkContainerInfo :: ContainerId -> Container -> ContainerInfo
mkContainerInfo cid@(ContainerId hn _cn) (Container img h) =