summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-19 19:32:16 -0400
committerJoey Hess2014-05-19 19:32:16 -0400
commite2c67a6e18a27faab46f5842535d87ae26f167be (patch)
tree84859616d6f7cb6405e313e655c3b0b37db82b07 /config-joey.hs
parentc8b59684cd45ef2736a4e492e659844ea74e2c85 (diff)
propellor spin
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs21
1 files changed, 13 insertions, 8 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 3d464e37..5e731dc0 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -192,28 +192,33 @@ hosts = -- (o) `
, standardGitAnnexBuilder "amd64" 15 "2h"
, standardGitAnnexBuilder "i386" 45 "2h"
-- armel builder has a companion container using amd64 that
- -- 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. The armel builder can ssh in to the
- -- companion.
+ -- runs the build first to get TH splices. They need
+ -- to have the same versions of all haskell libraries installed.
, Docker.container "armel-git-annex-builder-companion"
(image $ System (Debian Unstable) "amd64")
- & Docker.volume GitAnnexBuilder.homedir
& Apt.unattendedUpgrades
+ -- This volume is shared with the armel builder.
+ & Docker.volume GitAnnexBuilder.homedir
+ & File.ownerGroup GitAnnexBuilder.homedir GitAnnexBuilder.builduser GitAnnexBuilder.builduser
+ -- Install current versions of build deps from cabal.
& GitAnnexBuilder.treeDeps "armel"
& GitAnnexBuilder.cabalDeps
- & GitAnnexBuilder.sshKeyGen
+ -- The armel builder can ssh to this companion,
+ -- using $COMPANION_PORT_22_TCP_ADDR as the hostname,
& Docker.expose "22"
& Apt.serviceInstalledRunning "ssh"
+ -- ssh key is shared via the home directory volume
+ & GitAnnexBuilder.sshKeyGen
, Docker.container "armel-git-annex-builder"
(image $ System (Debian Unstable) "armel")
+ & Apt.unattendedUpgrades
+ & Apt.installed ["openssh-client"]
& Docker.link "armel-git-annex-builder-companion" "companion"
& Docker.volumes_from "armel-git-annex-builder-companion"
- & GitAnnexBuilder.builder "armel" "1 3 * * *" "5h" True
-- TODO: automate installing haskell libs
-- (Currently have to run
-- git-annex/standalone/linux/install-haskell-packages)
- & Apt.unattendedUpgrades
+ & GitAnnexBuilder.builder "armel" "1 3 * * *" "5h" True
] ++ monsters
standardGitAnnexBuilder :: Architecture -> Int -> GitAnnexBuilder.TimeOut -> Host