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

Update Joey's config according to new Docker.Image definition

This commit is contained in:
Antoine Eiche 2015-06-15 11:53:27 +02:00 committed by Joey Hess
parent 46241b3a89
commit 182fa98253
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config-joey.hs
View File

@ -505,10 +505,10 @@ standardDockerContainer name suite arch = Docker.container name (dockerImage sys
-- Docker images I prefer to use. -- Docker images I prefer to use.
dockerImage :: System -> Docker.Image dockerImage :: System -> Docker.Image
dockerImage (System (Debian Unstable) arch) = "joeyh/debian-unstable-" ++ arch dockerImage (System (Debian Unstable) arch) = Docker.Image ("joeyh/debian-unstable-" ++ arch) Nothing
dockerImage (System (Debian Testing) arch) = "joeyh/debian-unstable-" ++ arch dockerImage (System (Debian Testing) arch) = Docker.Image ("joeyh/debian-unstable-" ++ arch) Nothing
dockerImage (System (Debian (Stable _)) arch) = "joeyh/debian-stable-" ++ arch dockerImage (System (Debian (Stable _)) arch) = Docker.Image ("joeyh/debian-stable-" ++ arch) Nothing
dockerImage _ = "debian-stable-official" -- does not currently exist! dockerImage _ = Docker.Image "debian-stable-official" Nothing -- does not currently exist!
myDnsSecondary :: Property HasInfo myDnsSecondary :: Property HasInfo
myDnsSecondary = propertyList "dns secondary for all my domains" $ props myDnsSecondary = propertyList "dns secondary for all my domains" $ props