summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2015-06-16 14:53:08 -0400
committerJoey Hess2015-06-16 14:53:08 -0400
commitd353db60ad3a712d691832a67d40248b26a53e68 (patch)
tree7dce0ccf6bb88bd4147230a88b13cef365580144 /config-joey.hs
parentb55ea3c29560bafced4b191393410177ba862327 (diff)
parent948f855c63d6f2da09ce3689d1b610b343501f73 (diff)
Merge branch 'joeyconfig'
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..8b53718a 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.latestImage ("joeyh/debian-unstable-" ++ arch)
+dockerImage (System (Debian Testing) arch) = Docker.latestImage ("joeyh/debian-unstable-" ++ arch)
+dockerImage (System (Debian (Stable _)) arch) = Docker.latestImage ("joeyh/debian-stable-" ++ arch)
+dockerImage _ = Docker.latestImage "debian-stable-official" -- does not currently exist!
myDnsSecondary :: Property HasInfo
myDnsSecondary = propertyList "dns secondary for all my domains" $ props