summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config-joey.hs1
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs3
2 files changed, 4 insertions, 0 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 63768eeb..2c73b3e5 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -293,6 +293,7 @@ standardContainer name suite arch = Docker.container name (dockerImage system)
-- Docker images I prefer to use.
dockerImage :: System -> Docker.Image
dockerImage (System (Debian Unstable) arch) = "joeyh/debian-unstable-" ++ arch
+dockerImage (System (Debian Testing) arch) = "joeyh/debian-unstable-" ++ arch
dockerImage (System (Debian Stable) arch) = "joeyh/debian-stable-" ++ arch
dockerImage _ = "debian-stable-official" -- does not currently exist!
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 0a5cb1b7..d9309287 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -104,6 +104,7 @@ standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.conta
& Apt.installed ["systemd"]
& Apt.unattendedUpgrades
& buildDepsApt
+ & User.accountFor builduser
& autobuilder (show buildminute ++ " * * * *") timeout True
`requires` tree arch
@@ -150,6 +151,7 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-
& Apt.unattendedUpgrades
-- This volume is shared with the armel builder.
& Docker.volume gitbuilderdir
+ & User.accountFor builduser
-- Install current versions of build deps from cabal.
& tree "armel"
& buildDepsFewHaskellLibs
@@ -169,6 +171,7 @@ armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "arme
& Apt.installed ["openssh-client"]
& Docker.link "armel-git-annex-builder-companion" "companion"
& Docker.volumes_from "armel-git-annex-builder-companion"
+ & User.accountFor builduser
-- TODO: automate installing haskell libs
-- (Currently have to run
-- git-annex/standalone/linux/install-haskell-packages