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

tweaks

This commit is contained in:
Joey Hess 2014-03-30 21:03:42 -04:00
parent cc16366ff2
commit 5da737d027
Failed to extract signature
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Propellor.hs
View File

@ -24,7 +24,6 @@ getProperties hostname@"clam.kitenet.net" =
-- Clam is a tor bridge. -- Clam is a tor bridge.
, Tor.isBridge , Tor.isBridge
-- I play with docker on clam. -- I play with docker on clam.
, Apt.installed ["docker.io"]
, Docker.configured , Docker.configured
-- This is not an important system so I don't want to need to -- This is not an important system so I don't want to need to
-- manually upgrade it. -- manually upgrade it.

11
Property/Docker.hs
View File

@ -2,10 +2,15 @@ module Property.Docker where
import Common import Common
import qualified Property.File as File import qualified Property.File as File
import qualified Property.Apt as Apt
{- Configures docker with an authentication file, so that images can be {- Configures docker with an authentication file, so that images can be
- pushed to index.docker.io. -} - pushed to index.docker.io. -}
configured :: Property configured :: Property
configured = Property "docker configured" $ configured = Property "docker configured" go `requires` installed
withPrivData DockerAuthentication $ \cfg -> where
ensureProperty $ "/root/.dockercfg" `File.hasContent` (lines cfg) go = withPrivData DockerAuthentication $ \cfg -> ensureProperty $
"/root/.dockercfg" `File.hasContent` (lines cfg)
installed :: Property
installed = Apt.installed ["docker.io"]