diff options
| author | Joey Hess <joey@kitenet.net> | 2014-06-05 17:01:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-05 17:01:32 -0400 |
| commit | 4ac314fb4812ccdb62e930fe53e312ced6171e12 (patch) | |
| tree | 110f785501a6bc7638edebfc12a7f6d3d7bea472 /src/Propellor/Property/SiteSpecific | |
| parent | e1d7441e32818e06269353fa0044851ae09e1bdd (diff) | |
Apt.stdSourcesList no longer needs a suite to be specified.
Diffstat (limited to 'src/Propellor/Property/SiteSpecific')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 6e4ca81a..57a6b084 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -100,7 +100,7 @@ standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder") (dockerImage $ System (Debian Unstable) arch) & os (System (Debian Unstable) arch) - & Apt.stdSourcesList Unstable + & Apt.stdSourcesList & Apt.installed ["systemd"] & Apt.unattendedUpgrades & buildDepsApt @@ -118,7 +118,7 @@ androidContainer :: (System -> Docker.Image) -> Docker.ContainerName -> Property androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.container name (dockerImage $ System (Debian Stable) "i386") & os (System (Debian Stable) "i386") - & Apt.stdSourcesList Stable + & Apt.stdSourcesList & Apt.installed ["systemd"] & User.accountFor builduser & File.dirExists gitbuilderdir @@ -145,7 +145,7 @@ armelCompanionContainer :: (System -> Docker.Image) -> Host armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-companion" (dockerImage $ System (Debian Unstable) "amd64") & os (System (Debian Unstable) "amd64") - & Apt.stdSourcesList Unstable + & Apt.stdSourcesList & Apt.installed ["systemd"] & Apt.unattendedUpgrades -- This volume is shared with the armel builder. @@ -163,7 +163,7 @@ armelAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeO armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "armel-git-annex-builder" (dockerImage $ System (Debian Unstable) "armel") & os (System (Debian Unstable) "armel") - & Apt.stdSourcesList Unstable + & Apt.stdSourcesList & Apt.unattendedUpgrades & Apt.installed ["systemd"] & Apt.installed ["openssh-client"] |