summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-05-31 21:36:09 -0400
committerJoey Hess2014-05-31 21:36:09 -0400
commit31d9dd297db1a27c121df484c8f71ccfb612f375 (patch)
tree10e0d232d3fbee49e5346c10fad450d49496d02a /src/Propellor
parentd1aaf06f1c30764f26428223840a7d66f255ab47 (diff)
propellor spin
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Property/Docker.hs29
1 files changed, 24 insertions, 5 deletions
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index ce10d318..b0af14c1 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -5,7 +5,29 @@
-- The existance of a docker container is just another Property of a system,
-- which propellor can set up. See config.hs for an example.
-module Propellor.Property.Docker where
+module Propellor.Property.Docker (
+ Image,
+ ContainerName,
+ configured,
+ installed,
+ container,
+ docked,
+ garbageCollected,
+ -- * Container configuration
+ dns,
+ hostname,
+ name,
+ publish,
+ expose,
+ user,
+ volume,
+ volumes_from,
+ workdir,
+ memory,
+ link,
+ -- * Internal use
+ chain,
+) where
import Propellor
import Propellor.SimpleSh
@@ -16,7 +38,7 @@ import qualified Propellor.Property.Docker.Shim as Shim
import Utility.SafeCommand
import Utility.Path
-import Control.Concurrent.Async
+import Control.Concurrent.Async hiding (link)
import System.Posix.Directory
import System.Posix.Process
import Data.List
@@ -218,9 +240,6 @@ data ContainerId = ContainerId HostName ContainerName
data ContainerIdent = ContainerIdent Image HostName ContainerName [RunParam]
deriving (Read, Show, Eq)
-ident2id :: ContainerIdent -> ContainerId
-ident2id (ContainerIdent _ hn cn _) = ContainerId hn cn
-
toContainerId :: String -> Maybe ContainerId
toContainerId s
| myContainerSuffix `isSuffixOf` s = case separate (== '.') (desuffix s) of