summaryrefslogtreecommitdiff
path: root/config-joey.hs
diff options
context:
space:
mode:
authorJoey Hess2015-05-27 21:11:36 -0400
committerJoey Hess2015-05-27 21:11:36 -0400
commit9ce43e55f8db84ac1111ad29f0c134814f805fed (patch)
treef94c6ba350e2a07c5aeeabe17e0a60f6f9896038 /config-joey.hs
parent672a783d3a2804ceeb6f179f37042eba5248f4c1 (diff)
Improve enter-machine scripts for nspawn containers to unset most environment variables.
Diffstat (limited to 'config-joey.hs')
-rw-r--r--config-joey.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 013be113..e01af471 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -134,10 +134,10 @@ orca = standardSystem "orca.kitenet.net" Unstable "amd64"
! Docker.docked (GitAnnexBuilder.standardAutoBuilderContainer dockerImage "amd64" 15 "2h")
! Docker.docked (GitAnnexBuilder.standardAutoBuilderContainer dockerImage "i386" 45 "2h")
! Docker.docked (GitAnnexBuilder.androidAutoBuilderContainer dockerImage (Cron.Times "1 1 * * *") "3h")
+ ! Docker.docked (GitAnnexBuilder.armelCompanionContainer dockerImage)
+ ! Docker.docked (GitAnnexBuilder.armelAutoBuilderContainer dockerImage (Cron.Times "1 3 * * *") "5h")
& Docker.garbageCollected -- `period` Daily
& Systemd.nspawned (GitAnnexBuilder.standardAutoBuilderContainerNspawn "amd64" 15 "2h")
- & Docker.docked (GitAnnexBuilder.armelCompanionContainer dockerImage)
- & Docker.docked (GitAnnexBuilder.armelAutoBuilderContainer dockerImage (Cron.Times "1 3 * * *") "5h")
& Apt.buildDep ["git-annex"] `period` Daily
-- This is not a complete description of kite, since it's a