summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Docker.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 18:02:56 -0400
committerJoey Hess2014-05-31 18:04:41 -0400
commit5fc4b006517051e937cbfa13b5f7ccbc25460c1b (patch)
treef99b7dcf46d262f13aa80fb39c8fcc1a67c951a9 /src/Propellor/Property/Docker.hs
parentd3ac75a1a29e9eda60b78d25e7352d4a2d5713cc (diff)
remove now redundant _hostname field of Attr
Now that Host includes _hostName, it's redundant to also keep it in Attr. This requires changing the reader monad to operate on the whole Host.
Diffstat (limited to 'src/Propellor/Property/Docker.hs')
-rw-r--r--src/Propellor/Property/Docker.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index c1340ad9..34a9deb7 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -48,7 +48,7 @@ type ContainerName = String
container :: ContainerName -> Image -> Host
container cn image = Host hn [] (\_ -> attr)
where
- attr = (newAttr hn) { _dockerImage = Just image }
+ attr = newAttr { _dockerImage = Just image }
hn = cn2hn cn
cn2hn :: ContainerName -> HostName
@@ -99,7 +99,7 @@ exposeDnsAttrs :: Host -> Property -> Property
exposeDnsAttrs (Host _ _ containerattr) p = combineProperties (propertyDesc p) $
p : map addDNS (S.toList containerdns)
where
- containerdns = _dns $ containerattr $ newAttr undefined
+ containerdns = _dns $ containerattr newAttr
findContainer
:: Maybe Host