Merge branch 'joeyconfig'

Conflicts:
	privdata.joey/privdata.gpg

1 files changed, 19 insertions, 10 deletions

diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 745b5622..fdc312ce 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleContexts, TypeSynonymInstances, FlexibleInstances #-}
 
 -- | Docker support for propellor
 --
@@ -18,7 +18,8 @@ module Propellor.Property.Docker (
 	tweaked,
 	Image,
 	ContainerName,
-	Container(..),
+	Container,
+	HasImage(..),
 	-- * Container configuration
 	dns,
 	hostname,
@@ -79,10 +80,16 @@ configured = prop `requires` installed
 type ContainerName = String
 
 -- | A docker container.
-data Container = Container
-	{ containerImage :: Image
-	, containerHost :: Host
-	}
+data Container = Container Image Host
+
+class HasImage a where
+	getImageName :: a -> Image
+
+instance HasImage Image where
+	getImageName = id
+
+instance HasImage Container where
+	getImageName (Container i _) = i
 
 instance PropAccum Container where
 	(Container i h) & p = Container i (h & p)
@@ -142,19 +149,21 @@ docked ctr@(Container _ h) =
 			]
 
 -- | Build the image from a directory containing a Dockerfile.
-imageBuilt :: FilePath -> Image -> Property NoInfo
-imageBuilt directory image = describe built msg
+imageBuilt :: HasImage c => FilePath -> c -> Property NoInfo
+imageBuilt directory ctr = describe built msg
   where
 	msg = "docker image " ++ image ++ " built from " ++ directory
 	built = Cmd.cmdProperty' dockercmd ["build", "--tag", image, "./"] workDir
 	workDir p = p { cwd = Just directory }
+	image = getImageName ctr
 
 -- | Pull the image from the standard Docker Hub registry.
-imagePulled :: Image -> Property NoInfo
-imagePulled image = describe pulled msg
+imagePulled :: HasImage c => c -> Property NoInfo
+imagePulled ctr = describe pulled msg
   where
 	msg = "docker image " ++ image ++ " pulled"
 	pulled = Cmd.cmdProperty dockercmd ["pull", image]
+	image = getImageName ctr
 
 propigateContainerInfo :: (IsProp (Property i)) => Container -> Property i -> Property HasInfo
 propigateContainerInfo ctr@(Container _ h) p = propigateContainer ctr p'