From 1af0cb35b691598b718a10c3de1b61692d4aafd6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Apr 2014 12:42:24 -0400 Subject: tweak --- Propellor/Property/Docker.hs | 4 ++-- config.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Propellor/Property/Docker.hs b/Propellor/Property/Docker.hs index 3e19db4f..dd4f1924 100644 --- a/Propellor/Property/Docker.hs +++ b/Propellor/Property/Docker.hs @@ -61,8 +61,8 @@ fromContainerId (ContainerId hn cn) = cn++"@"++hn data Container = Container Image [Containerized Property] -containerFromImage :: Image -> [Containerized Property] -> Container -containerFromImage = Container +containerFrom :: Image -> [Containerized Property] -> Container +containerFrom = Container containerProperties :: (HostName -> ContainerName -> Maybe (Container)) diff --git a/config.hs b/config.hs index dbbf89ed..8c7422b2 100644 --- a/config.hs +++ b/config.hs @@ -54,7 +54,7 @@ host _ = Nothing -- | This is where Docker containers are set up. A container -- can vary by hostname where it's used, or be the same everywhere. 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.volume "/var/www:/var/www" , Docker.inside -- cgit v1.2.3