summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorAntoine Eiche2015-06-15 11:53:27 +0200
committerJoey Hess2015-06-16 14:49:10 -0400
commit182fa98253072781795ad4f589da4216748b1218 (patch)
treecfedaa34b5dd92aff860d50aac38e3728e834dde /config-joey.hs
parent46241b3a89e8fd612ca3af6a3dc6495df01dbfe6 (diff)
Update Joey's config according to new Docker.Image definition
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs
index f791ed38..93a44764 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -505,10 +505,10 @@ standardDockerContainer name suite arch = Docker.container name (dockerImage sys
-- Docker images I prefer to use.
dockerImage :: System -> Docker.Image
-dockerImage (System (Debian Unstable) arch) = "joeyh/debian-unstable-" ++ arch
-dockerImage (System (Debian Testing) arch) = "joeyh/debian-unstable-" ++ arch
-dockerImage (System (Debian (Stable _)) arch) = "joeyh/debian-stable-" ++ arch
-dockerImage _ = "debian-stable-official" -- does not currently exist!
+dockerImage (System (Debian Unstable) arch) = Docker.Image ("joeyh/debian-unstable-" ++ arch) Nothing
+dockerImage (System (Debian Testing) arch) = Docker.Image ("joeyh/debian-unstable-" ++ arch) Nothing
+dockerImage (System (Debian (Stable _)) arch) = Docker.Image ("joeyh/debian-stable-" ++ arch) Nothing
+dockerImage _ = Docker.Image "debian-stable-official" Nothing -- does not currently exist!
myDnsSecondary :: Property HasInfo
myDnsSecondary = propertyList "dns secondary for all my domains" $ props