summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Docker.hs
diff options
context:
space:
mode:
authorJoey Hess2015-10-18 14:14:21 -0400
committerJoey Hess2015-10-18 14:14:21 -0400
commit6c96481dd39d1e0fbcef8dd68300a66e13db9ed9 (patch)
tree81b8c2a296dcaaa0e2cd43ece365cbf39c957e1c /src/Propellor/Property/Docker.hs
parentf6e352767eaf236acb929a9793dee28eb4897baa (diff)
parent2ad09b34ecec5a643a4a08c88a0a1cc7703094e3 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Docker.hs')
-rw-r--r--src/Propellor/Property/Docker.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 6aa17438..394c4271 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -119,13 +119,13 @@ container cn image = Container image (Host cn [] info)
-- propellor inside the container.
--
-- When the container's Properties include DNS info, such as a CNAME,
--- that is propigated to the Info of the Host it's docked in.
+-- that is propagated to the Info of the Host it's docked in.
--
-- Reverting this property ensures that the container is stopped and
-- removed.
docked :: Container -> RevertableProperty
docked ctr@(Container _ h) =
- (propigateContainerInfo ctr (go "docked" setup))
+ (propagateContainerInfo ctr (go "docked" setup))
<!>
(go "undocked" teardown)
where
@@ -170,8 +170,8 @@ imagePulled ctr = describe pulled msg
pulled = Cmd.cmdProperty dockercmd ["pull", imageIdentifier image]
image = getImageName ctr
-propigateContainerInfo :: (IsProp (Property i)) => Container -> Property i -> Property HasInfo
-propigateContainerInfo ctr@(Container _ h) p = propigateContainer cn ctr p'
+propagateContainerInfo :: (IsProp (Property i)) => Container -> Property i -> Property HasInfo
+propagateContainerInfo ctr@(Container _ h) p = propagateContainer cn ctr p'
where
p' = infoProperty
(propertyDesc p)