diff options
| author | Joey Hess <joeyh@joeyh.name> | 2014-12-17 16:31:09 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-17 16:31:09 -0400 |
| commit | 8cc691dc868f1f43d985fea012dc84183b70341d (patch) | |
| tree | ab8485a66aa75c15e7dfdd2f00ab6011786e6b2d /src/Propellor/Property/Docker.hs | |
| parent | db3f9050d6f4a098b82ae014a6a6e5e96a3067f6 (diff) | |
| parent | ddeee3ceb8ef5aa94ffc0696bff085eb031309d6 (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/Docker.hs')
| -rw-r--r-- | src/Propellor/Property/Docker.hs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs index 2c8af413..b48afbbb 100644 --- a/src/Propellor/Property/Docker.hs +++ b/src/Propellor/Property/Docker.hs @@ -63,9 +63,11 @@ installed = Apt.installed ["docker.io"] configured :: Property configured = prop `requires` installed where - prop = withPrivData DockerAuthentication anyContext $ \getcfg -> + prop = withPrivData src anyContext $ \getcfg -> property "docker configured" $ getcfg $ \cfg -> ensureProperty $ "/root/.dockercfg" `File.hasContent` (lines cfg) + src = PrivDataSourceFileFromCommand DockerAuthentication + "/root/.dockercfg" "docker login" -- | A short descriptive name for a container. -- Should not contain whitespace or other unusual characters, |