diff options
| author | Joey Hess <joey@kitenet.net> | 2014-11-21 20:57:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-11-21 20:57:53 -0400 |
| commit | 91d58380b4fe3dd4dca5668ef6c7b2bf1edef79c (patch) | |
| tree | 5dde66ff4e0ecf12e654c30f13aceeda913f201d /src/Propellor/Property/Docker.hs | |
| parent | e60b261daea356a2fcab424a276a491fdd3f956c (diff) | |
| parent | 6cdd37d9ff3ff3e3b8439445c1363b9bdc77a5da (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Docker.hs')
| -rw-r--r-- | src/Propellor/Property/Docker.hs | 3 |
1 files changed, 2 insertions, 1 deletions
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 |