diff options
| author | Joey Hess <joey@kitenet.net> | 2014-06-05 16:19:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-05 16:19:34 -0400 |
| commit | d75cd6c7a373165944e73505412b674fb32786df (patch) | |
| tree | 1cbfca2dd138e56f9c7298d530e9ecb25d9f41d1 /src | |
| parent | 05ec16ecacf5b3ea296b242bc5c061b21569e26d (diff) | |
remove sysvinit and systemd from my docker images
sysvinit hangs on upgrade if not running
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 3dcafa35..ec1dee89 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -100,6 +100,7 @@ standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder") (dockerImage $ System (Debian Unstable) arch) & Apt.stdSourcesList Unstable + & Apt.removed ["sysvinit", "systemd"] & Apt.unattendedUpgrades & buildDepsApt & autobuilder (show buildminute ++ " * * * *") timeout True @@ -116,6 +117,7 @@ androidContainer :: (System -> Docker.Image) -> Docker.ContainerName -> Property androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.container name (dockerImage $ System (Debian Stable) "i386") & Apt.stdSourcesList Stable + & Apt.removed ["sysvinit", "systemd"] & User.accountFor builduser & File.dirExists gitbuilderdir & File.ownerGroup homedir builduser builduser @@ -141,6 +143,7 @@ armelCompanionContainer :: (System -> Docker.Image) -> Host armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-companion" (dockerImage $ System (Debian Unstable) "amd64") & Apt.stdSourcesList Unstable + & Apt.removed ["sysvinit", "systemd"] & Apt.unattendedUpgrades -- This volume is shared with the armel builder. & Docker.volume gitbuilderdir @@ -158,6 +161,7 @@ armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "arme (dockerImage $ System (Debian Unstable) "armel") & Apt.stdSourcesList Unstable & Apt.unattendedUpgrades + & Apt.removed ["sysvinit", "systemd"] & Apt.installed ["openssh-client"] & Docker.link "armel-git-annex-builder-companion" "companion" & Docker.volumes_from "armel-git-annex-builder-companion" |