From 6c92f1034f980718cef54cab58a1bcfdbc485f5d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Nov 2014 18:55:33 -0400 Subject: split out info types --- src/Propellor/Property/Chroot.hs | 1 + src/Propellor/Property/Docker.hs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Propellor/Property') diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index 7246e7eb..c3b14a8e 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -10,6 +10,7 @@ module Propellor.Property.Chroot ( ) where import Propellor +import Propellor.Types.Chroot import qualified Propellor.Property.Debootstrap as Debootstrap import qualified Propellor.Property.Systemd.Core as Systemd import qualified Propellor.Shim as Shim diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index 5cf60ff9..460bc3ec 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -39,6 +39,7 @@ module Propellor.Property.Docker ( ) where import Propellor hiding (init) +import Propellor.Types.Docker import qualified Propellor.Property.File as File import qualified Propellor.Property.Apt as Apt import qualified Propellor.Shim as Shim @@ -523,7 +524,7 @@ genProp :: String -> (HostName -> RunParam) -> Property genProp field mkval = pureInfoProperty field $ dockerInfo $ mempty { _dockerRunParams = [DockerRunParam (\hn -> "--"++field++"=" ++ mkval hn)] } -dockerInfo :: DockerInfo -> Info +dockerInfo :: DockerInfo Host -> Info dockerInfo i = mempty { _dockerinfo = i } -- | The ContainerIdent of a container is written to -- cgit v1.3-2-g0d8e