diff options
| author | Joey Hess <joey@kitenet.net> | 2014-06-10 00:53:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-10 00:53:54 -0400 |
| commit | 73fec82d7a9dc1eb93593ba00a22c9ab2041a9a0 (patch) | |
| tree | 99d86f842510e6885d4f0890e48788744241a8aa | |
| parent | a179c281e964e7254fa4cf5964e5516a395c7c74 (diff) | |
propellor spin
| -rw-r--r-- | config-joey.hs | 1 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 3 |
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 |