summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-05-27 21:17:53 -0400
committerJoey Hess2014-05-27 21:17:53 -0400
commit16fbf3c6f67f1eed11a9d189e2c7c2723ef5969a (patch)
tree9f28d1ee73a459677388dd23ac63c9b8354f4bd6
parentfe685d2660ca04226330a1955705dff458a49b2c (diff)
reorg git-annex android builder, and put a dev container on my laptop
-rw-r--r--config-joey.hs13
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs35
2 files changed, 28 insertions, 20 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 84cc7167..6c4dff7b 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -42,6 +42,7 @@ hosts = -- (o) `
& ipv6 "2001:4830:1600:187::2" -- sixxs tunnel
& Docker.configured
& Apt.buildDep ["git-annex"] `period` Daily
+ & Docker.docked hosts "android-git-annex"
-- Nothing super-important lives here.
, standardSystem "clam.kitenet.net" Unstable "amd64"
@@ -193,11 +194,15 @@ hosts = -- (o) `
(Just "remotes/origin/old-kitenet.net")
-- git-annex autobuilder containers
- , GitAnnexBuilder.standardContainer dockerImage "amd64" 15 "2h"
- , GitAnnexBuilder.standardContainer dockerImage "i386" 45 "2h"
+ , GitAnnexBuilder.standardAutoBuilderContainer dockerImage "amd64" 15 "2h"
+ , GitAnnexBuilder.standardAutoBuilderContainer dockerImage "i386" 45 "2h"
, GitAnnexBuilder.armelCompanionContainer dockerImage
- , GitAnnexBuilder.armelContainer dockerImage "1 3 * * *" "5h"
- , GitAnnexBuilder.androidContainer dockerImage "1 1 * * *" "3h"
+ , GitAnnexBuilder.armelAutoBuilderContainer dockerImage "1 3 * * *" "5h"
+ , GitAnnexBuilder.androidAutoBuilderContainer dockerImage "1 1 * * *" "3h"
+
+ -- for development of git-annex for android
+ , GitAnnexBuilder.androidContainer dockerImage "android-git-annex"
+ & Docker.volume ("/home/joey/src/git-annex:" ++ GitAnnexBuilder.homedir </> "git-annex")
] ++ monsters
-- This is my standard system setup.
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index a154c926..15e4e6ce 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -24,12 +24,8 @@ builddir = gitbuilderdir </> "build"
type TimeOut = String -- eg, 5h
builder :: Architecture -> CronTimes -> TimeOut -> Bool -> Property
-builder = builder' buildDeps
-
-builder' :: Property -> Architecture -> CronTimes -> TimeOut -> Bool -> Property
-builder' buildepsprop buildarch crontimes timeout rsyncupload = combineProperties "gitannexbuilder"
+builder buildarch crontimes timeout rsyncupload = combineProperties "gitannexbuilder"
[ tree buildarch
- , buildepsprop
, Apt.serviceInstalledRunning "cron"
, Cron.niceJob "gitannexbuilder" crontimes builduser gitbuilderdir $
"git pull ; timeout " ++ timeout ++ " ./autobuild"
@@ -72,8 +68,8 @@ tree buildarch = combineProperties "gitannexbuilder tree"
]
]
-buildDeps :: Property
-buildDeps = combineProperties "gitannexbuilder build deps"
+buildDepsApt :: Property
+buildDepsApt = combineProperties "gitannexbuilder build deps"
[ Apt.buildDep ["git-annex"]
, buildDepsFewHaskellLibs
, "git-annex source build deps installed" ==> Apt.buildDepIn builddir
@@ -102,20 +98,26 @@ cabalDeps = flagFile go cabalupdated
go = userScriptProperty builduser ["cabal update && cabal install git-annex --only-dependencies || true"]
cabalupdated = homedir </> ".cabal" </> "packages" </> "hackage.haskell.org" </> "00-index.cache"
-standardContainer :: (System -> Docker.Image) -> Architecture -> Int -> TimeOut -> Host
-standardContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder")
+standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int -> TimeOut -> Host
+standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder")
(dockerImage $ System (Debian Unstable) arch)
& Apt.stdSourcesList Unstable
& Apt.unattendedUpgrades
+ & buildDepsApt
& builder arch (show buildminute ++ " * * * *") timeout True
+androidAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host
+androidAutoBuilderContainer dockerImage crontimes timeout =
+ androidContainer dockerImage "android-git-annex-builder"
+ & Apt.unattendedUpgrades
+ & builder "android" crontimes timeout True
+
-- Android is cross-built in a Debian i386 container, using the Android NDK.
-androidContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host
-androidContainer dockerImage crontimes timeout = Docker.container "android-git-annex-builder"
+androidContainer :: (System -> Docker.Image) -> Docker.ContainerName -> Host
+androidContainer dockerImage name = Docker.container name
(dockerImage $ System (Debian Stable) "i386")
& Apt.stdSourcesList Stable
- & Apt.unattendedUpgrades
- & builder' buildDepsNoHaskellLibs "android" crontimes timeout True
+ & buildDepsNoHaskellLibs
& flagFile chrootsetup ("/chrootsetup")
-- TODO: automate installing haskell libs
-- (Currently have to run
@@ -148,8 +150,8 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-
& Apt.serviceInstalledRunning "ssh"
& Ssh.authorizedKeys builduser
-armelContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host
-armelContainer dockerImage crontimes timeout = Docker.container "armel-git-annex-builder"
+armelAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host
+armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "armel-git-annex-builder"
(dockerImage $ System (Debian Unstable) "armel")
& Apt.stdSourcesList Unstable
& Apt.unattendedUpgrades
@@ -160,7 +162,8 @@ armelContainer dockerImage crontimes timeout = Docker.container "armel-git-annex
-- (Currently have to run
-- git-annex/standalone/linux/install-haskell-packages
-- which is not fully automated.)
- & builder' buildDepsFewHaskellLibs "armel" crontimes timeout True
+ & buildDepsFewHaskellLibs
+ & builder "armel" crontimes timeout True
& Ssh.keyImported SshRsa builduser
& trivial writecompanionaddress
where