From e2c67a6e18a27faab46f5842535d87ae26f167be Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 19 May 2014 19:32:16 -0400
Subject: [PATCH] propellor spin

---
 config-joey.hs | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/config-joey.hs b/config-joey.hs
index 3d464e3..5e731dc 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