From 416a6646c34a27f3bb7d39117f78d71fca98d2f6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jun 2014 12:34:32 -0400 Subject: [PATCH 1/7] cleanup --- src/wrapper.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wrapper.hs b/src/wrapper.hs index f180e85..4d2c50f 100644 --- a/src/wrapper.hs +++ b/src/wrapper.hs @@ -1,7 +1,7 @@ -- | Wrapper program for propellor distribution. -- -- 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) -- From c8c96a690871c11d917707e0efdf313dd23e7895 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jun 2014 12:34:52 -0400 Subject: [PATCH 2/7] changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index b8db168..b7303cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ propellor (0.7.0) UNRELEASED; urgency=medium trying to satisfy all properties on the list before propigating the failure. * Attr is renamed to Info. + * Renamed wrapper to propellor to make cabal installation of propellor work. -- Joey Hess Sat, 07 Jun 2014 00:12:44 -0400 From ed0ee936aea5c50429bfe0634d162d02cfcc7fa6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jun 2014 22:47:40 -0400 Subject: [PATCH 3/7] propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 57a6b08..3e6ec65 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -98,8 +98,8 @@ cabalDeps = flagFile go cabalupdated standardAutoBuilderContainer :: (System -> Docker.Image) -> Architecture -> Int -> TimeOut -> Host standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.container (arch ++ "-git-annex-builder") - (dockerImage $ System (Debian Unstable) arch) - & os (System (Debian Unstable) arch) + (dockerImage $ System (Debian Testing) arch) + & os (System (Debian Testing) arch) & Apt.stdSourcesList & Apt.installed ["systemd"] & Apt.unattendedUpgrades From 9299f2128b07c295fdcff15595f3a519e0b2dc83 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jun 2014 23:14:57 -0400 Subject: [PATCH 4/7] propellor spin From a179c281e964e7254fa4cf5964e5516a395c7c74 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jun 2014 23:32:53 -0400 Subject: [PATCH 5/7] propellor spin --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index 3e6ec65..0a5cb1b 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -144,7 +144,7 @@ androidContainer dockerImage name setupgitannexdir gitannexdir = Docker.containe armelCompanionContainer :: (System -> Docker.Image) -> Host armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder-companion" (dockerImage $ System (Debian Unstable) "amd64") - & os (System (Debian Unstable) "amd64") + & os (System (Debian Testing) "amd64") & Apt.stdSourcesList & Apt.installed ["systemd"] & Apt.unattendedUpgrades @@ -162,7 +162,7 @@ armelCompanionContainer dockerImage = Docker.container "armel-git-annex-builder- armelAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host armelAutoBuilderContainer dockerImage crontimes timeout = Docker.container "armel-git-annex-builder" (dockerImage $ System (Debian Unstable) "armel") - & os (System (Debian Unstable) "armel") + & os (System (Debian Testing) "armel") & Apt.stdSourcesList & Apt.unattendedUpgrades & Apt.installed ["systemd"] From 73fec82d7a9dc1eb93593ba00a22c9ab2041a9a0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 Jun 2014 00:53:54 -0400 Subject: [PATCH 6/7] propellor spin --- config-joey.hs | 1 + src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/config-joey.hs b/config-joey.hs index 63768ee..2c73b3e 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 0a5cb1b..d930928 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 From 8432378f2c07280feae0dd84f596a8c0ae96f2ca Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 10 Jun 2014 01:15:18 -0400 Subject: [PATCH 7/7] need tree for apt build-deps --- src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs index d930928..8ef4f6a 100644 --- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs +++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs @@ -103,10 +103,10 @@ standardAutoBuilderContainer dockerImage arch buildminute timeout = Docker.conta & Apt.stdSourcesList & Apt.installed ["systemd"] & Apt.unattendedUpgrades - & buildDepsApt & User.accountFor builduser + & tree arch + & buildDepsApt & autobuilder (show buildminute ++ " * * * *") timeout True - `requires` tree arch androidAutoBuilderContainer :: (System -> Docker.Image) -> Cron.CronTimes -> TimeOut -> Host androidAutoBuilderContainer dockerImage crontimes timeout =