cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove sysvinit by installing systemd

This commit is contained in:
Joey Hess 2014-06-05 16:24:47 -04:00
parent 3834181f62
commit 1cf1e21532
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-joey.hs
View File

@ -272,7 +272,7 @@ standardContainer :: Docker.ContainerName -> DebianSuite -> Architecture -> Host
standardContainer name suite arch = Docker.container name (dockerImage system) standardContainer name suite arch = Docker.container name (dockerImage system)
& os (System (Debian suite) arch) & os (System (Debian suite) arch)
& Apt.stdSourcesList suite & Apt.stdSourcesList suite
& Apt.removed ["sysvinit", "systemd"] & Apt.installed ["systemd"]
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& Apt.cacheCleaned & Apt.cacheCleaned
where where

8
src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
View File

@ -100,7 +100,7 @@ standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int
standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder") standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder")
(dockerImage $ System (Debian Unstable) arch) (dockerImage $ System (Debian Unstable) arch)
& Apt.stdSourcesList Unstable & Apt.stdSourcesList Unstable
& Apt.removed ["sysvinit", "systemd"] & Apt.installed ["systemd"]
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& buildDepsApt & buildDepsApt
& autobuilder (show buildminute ++ " * * * *") timeout True & autobuilder (show buildminute ++ " * * * *") timeout True
@ -117,7 +117,7 @@ androidContainer :: (System -> Docker.Image) -> Docker.ContainerName -> Property
androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.container name androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.container name
(dockerImage $ System (Debian Stable) "i386") (dockerImage $ System (Debian Stable) "i386")
& Apt.stdSourcesList Stable & Apt.stdSourcesList Stable
& Apt.removed ["sysvinit", "systemd"] & Apt.installed ["systemd"]
& User.accountFor builduser & User.accountFor builduser
& File.dirExists gitbuilderdir & File.dirExists gitbuilderdir
& File.ownerGroup homedir builduser builduser & File.ownerGroup homedir builduser builduser
@ -143,7 +143,7 @@ armelCompanionContainer :: (System -> Docker.Image) -> Host
armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-companion" armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-companion"
(dockerImage $ System (Debian Unstable) "amd64") (dockerImage $ System (Debian Unstable) "amd64")
& Apt.stdSourcesList Unstable & Apt.stdSourcesList Unstable
& Apt.removed ["sysvinit", "systemd"] & Apt.installed ["systemd"]
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
-- This volume is shared with the armel builder. -- This volume is shared with the armel builder.
& Docker.volume gitbuilderdir & Docker.volume gitbuilderdir
@ -161,7 +161,7 @@ armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "arme
(dockerImage $ System (Debian Unstable) "armel") (dockerImage $ System (Debian Unstable) "armel")
& Apt.stdSourcesList Unstable & Apt.stdSourcesList Unstable
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& Apt.removed ["sysvinit", "systemd"] & Apt.installed ["systemd"]
& Apt.installed ["openssh-client"] & Apt.installed ["openssh-client"]
& Docker.link "armel-git-annex-builder-companion" "companion" & Docker.link "armel-git-annex-builder-companion" "companion"
& Docker.volumes_from "armel-git-annex-builder-companion" & Docker.volumes_from "armel-git-annex-builder-companion"