cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tweak

This commit is contained in:
Joey Hess 2014-04-01 12:42:24 -04:00
parent 2fd17d628c
commit 1af0cb35b6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Propellor/Property/Docker.hs
View File

@ -61,8 +61,8 @@ fromContainerId (ContainerId hn cn) = cn++"@"++hn
data Container = Container Image [Containerized Property] data Container = Container Image [Containerized Property]
containerFromImage :: Image -> [Containerized Property] -> Container containerFrom :: Image -> [Containerized Property] -> Container
containerFromImage = Container containerFrom = Container
containerProperties containerProperties
:: (HostName -> ContainerName -> Maybe (Container)) :: (HostName -> ContainerName -> Maybe (Container))

2
config.hs
View File

@ -54,7 +54,7 @@ host _ = Nothing
-- | This is where Docker containers are set up. A container -- | This is where Docker containers are set up. A container
-- can vary by hostname where it's used, or be the same everywhere. -- can vary by hostname where it's used, or be the same everywhere.
container :: HostName -> Docker.ContainerName -> Maybe (Docker.Container) container :: HostName -> Docker.ContainerName -> Maybe (Docker.Container)
container _ "webserver" = Just $ Docker.containerFromImage "debian" container _ "webserver" = Just $ Docker.containerFrom "joeyh/debian-unstable"
[ Docker.publish "80:80" [ Docker.publish "80:80"
, Docker.volume "/var/www:/var/www" , Docker.volume "/var/www:/var/www"
, Docker.inside , Docker.inside