summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2014-05-27 21:17:53 -0400
committerJoey Hess2014-05-27 21:17:53 -0400
commit16fbf3c6f67f1eed11a9d189e2c7c2723ef5969a (patch)
tree9f28d1ee73a459677388dd23ac63c9b8354f4bd6 /config-joey.hs
parentfe685d2660ca04226330a1955705dff458a49b2c (diff)
reorg git-annex android builder, and put a dev container on my laptop
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs13
1 files changed, 9 insertions, 4 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.