summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-04-08 01:42:59 -0400
committerJoey Hess2014-04-08 01:42:59 -0400
commitd8a241322e16cc55881781f06a12005395010d3e (patch)
treed4a64fa6a8fcbc2ec0af9737a19a008483e4a188 /config-joey.hs
parentc62c606c0e459fe19f258bcf5ba80958349f3e1e (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs21
1 files changed, 20 insertions, 1 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 0bc948b9..f2cc5e78 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -45,7 +45,8 @@ host hostname@"orca.kitenet.net" = standardSystem Unstable $ props
& Apt.buildDep ["git-annex"]
& Docker.docked container hostname "amd64-git-annex-builder"
& Docker.docked container hostname "i386-git-annex-builder"
- -- ! Docker.docked container hostname "armel-git-annex-builder"
+ & Docker.docked container hostname "armel-git-annex-builder-companion"
+ & Docker.docked container hostname "armel-git-annex-builder"
& Docker.garbageCollected
-- My laptop
host _hostname@"darkstar.kitenet.net" = Just $ props
@@ -67,11 +68,29 @@ container _host name
& serviceRunning "apache2"
`requires` Apt.installed ["apache2"]
]
+
+ -- armel builder has a companion container that run amd64 and
+ -- runs the build first to get TH splices. They share a home
+ -- directory, and need to have the same versions of all haskell
+ -- libraries installed.
+ | name == "armel-git-annex-builder-companion" = Just $ Docker.containerFrom
+ (image $ System (Debian Unstable) "amd64")
+ [ Docker.volume GitAnnexBuilder.homedir
+ ]
+ | name == "armel-git-annex-builder" = Just $ Docker.containerFrom
+ (image $ System (Debian Unstable) "armel")
+ [ Docker.link (name ++ "-companion") "companion"
+ , Docker.volumes_from (name ++ "-companion")
+ , Docker.inside $ props
+-- & GitAnnexBuilder.builder "armel" "15 * * * *" True
+ ]
+
| "-git-annex-builder" `isSuffixOf` name =
let arch = takeWhile (/= '-') name
in Just $ Docker.containerFrom
(image $ System (Debian Unstable) arch)
[ Docker.inside $ props & GitAnnexBuilder.builder arch "15 * * * *" True ]
+
| otherwise = Nothing
-- | Docker images I prefer to use.