summaryrefslogtreecommitdiff
path: root/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2014-04-01 11:59:48 -0400
committerJoey Hess2014-04-01 11:59:48 -0400
commite02f802ac848fe9395d9a7019b4041eca814b0c9 (patch)
tree5d155413c22200754ae4927474aac5ff4f311c75 /Propellor/Property
parentbf4ba055287f46d6e125d8fd7870dd981d224fc8 (diff)
add PROPELLOR_DEBUG
Diffstat (limited to 'Propellor/Property')
-rw-r--r--Propellor/Property/Docker.hs7
1 files changed, 5 insertions, 2 deletions
diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs
index 450f397b..cacff5ce 100644
--- a/Propellor/Property/Docker.hs
+++ b/Propellor/Property/Docker.hs
@@ -211,8 +211,11 @@ runProp field val = Containerized [param] (Property param (return NoChange))
param = field++"="++val
-- | Lift a Property to run inside the container.
-inside :: Property -> Containerized Property
-inside p = Containerized [] p
+inside1 :: Property -> Containerized Property
+inside1 = Containerized []
+
+inside :: [Property] -> Containerized Property
+inside = Containerized [] . combineProperties
-- | Set custom dns server for container.
dns :: String -> Containerized Property