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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-06-10 01:15:30 -04:00
parent 14e178d1d4 8432378f2c
commit cc9aa510c9
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config-joey.hs
View File

@ -293,6 +293,7 @@ standardContainer name suite arch = Docker.container name (dockerImage system)
-- Docker images I prefer to use. -- Docker images I prefer to use.
dockerImage :: System -> Docker.Image dockerImage :: System -> Docker.Image
dockerImage (System (Debian Unstable) arch) = "joeyh/debian-unstable-" ++ arch 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 (System (Debian Stable) arch) = "joeyh/debian-stable-" ++ arch
dockerImage _ = "debian-stable-official" -- does not currently exist! dockerImage _ = "debian-stable-official" -- does not currently exist!

1
debian/changelog vendored
View File

@ -4,6 +4,7 @@ propellor (0.7.0) UNRELEASED; urgency=medium
trying to satisfy all properties on the list before propigating the trying to satisfy all properties on the list before propigating the
failure. failure.
* Attr is renamed to Info. * Attr is renamed to Info.
* Renamed wrapper to propellor to make cabal installation of propellor work.
-- Joey Hess <joeyh@debian.org> Sat, 07 Jun 2014 00:12:44 -0400 -- Joey Hess <joeyh@debian.org> Sat, 07 Jun 2014 00:12:44 -0400

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

@ -98,14 +98,15 @@ cabalDeps = flagFile go cabalupdated
standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int -> TimeOut -> Host standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int -> TimeOut -> Host
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 Testing) arch)
& os (System (Debian Unstable) arch) & os (System (Debian Testing) arch)
& Apt.stdSourcesList & Apt.stdSourcesList
& Apt.installed ["systemd"] & Apt.installed ["systemd"]
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& User.accountFor builduser
& tree arch
& buildDepsApt & buildDepsApt
& autobuilder (show buildminute ++ " * * * *") timeout True & autobuilder (show buildminute ++ " * * * *") timeout True
`requires` tree arch
androidAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host androidAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host
androidAutoBuilderContainer dockerImage crontimes timeout = androidAutoBuilderContainer dockerImage crontimes timeout =
@ -144,12 +145,13 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe
armelCompanionContainer :: (System -> Docker.Image) -> Host 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")
& os (System (Debian Unstable) "amd64") & os (System (Debian Testing) "amd64")
& Apt.stdSourcesList & Apt.stdSourcesList
& Apt.installed ["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
& User.accountFor builduser
-- Install current versions of build deps from cabal. -- Install current versions of build deps from cabal.
& tree "armel" & tree "armel"
& buildDepsFewHaskellLibs & buildDepsFewHaskellLibs
@ -162,13 +164,14 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-
armelAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host armelAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host
armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "armel-git-annex-builder" armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "armel-git-annex-builder"
(dockerImage $ System (Debian Unstable) "armel") (dockerImage $ System (Debian Unstable) "armel")
& os (System (Debian Unstable) "armel") & os (System (Debian Testing) "armel")
& Apt.stdSourcesList & Apt.stdSourcesList
& Apt.unattendedUpgrades & Apt.unattendedUpgrades
& Apt.installed ["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"
& User.accountFor builduser
-- TODO: automate installing haskell libs -- TODO: automate installing haskell libs
-- (Currently have to run -- (Currently have to run
-- git-annex/standalone/linux/install-haskell-packages -- git-annex/standalone/linux/install-haskell-packages

2
src/wrapper.hs
View File

@ -1,7 +1,7 @@
-- | Wrapper program for propellor distribution. -- | Wrapper program for propellor distribution.
-- --
-- Distributions should install this program into PATH. -- Distributions should install this program into PATH.
-- (Cabal builds it as dist/build/propellor. -- (Cabal builds it as dist/build/propellor/propellor).
-- --
-- This is not the propellor main program (that's config.hs) -- This is not the propellor main program (that's config.hs)
-- --