diff options
| author | Joey Hess <joey@kitenet.net> | 2014-03-30 21:03:42 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-30 21:03:42 -0400 |
| commit | 5da737d027c6858fe737f6611d497b79287ec5ea (patch) | |
| tree | ff9e0782e9853c910655f648551e52286cc4cb0a /Property | |
| parent | cc16366ff2998866fa3b222114cb989985b48359 (diff) | |
tweaks
Diffstat (limited to 'Property')
| -rw-r--r-- | Property/Docker.hs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Property/Docker.hs b/Property/Docker.hs index 9d01d0b3..ebb3d3a4 100644 --- a/Property/Docker.hs +++ b/Property/Docker.hs @@ -2,10 +2,15 @@ module Property.Docker where import Common import qualified Property.File as File +import qualified Property.Apt as Apt {- Configures docker with an authentication file, so that images can be - pushed to index.docker.io. -} configured :: Property -configured = Property "docker configured" $ - withPrivData DockerAuthentication $ \cfg -> - ensureProperty $ "/root/.dockercfg" `File.hasContent` (lines cfg) +configured = Property "docker configured" go `requires` installed + where + go = withPrivData DockerAuthentication $ \cfg -> ensureProperty $ + "/root/.dockercfg" `File.hasContent` (lines cfg) + +installed :: Property +installed = Apt.installed ["docker.io"] |
