summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2014-06-10 01:15:30 -0400
committerJoey Hess2014-06-10 01:15:30 -0400
commitcc9aa510c97e1838fc9dbc0a1331db1e88954bab (patch)
treea0248f852920e6d508f08bdec7aa9fe0317e43a5
parent14e178d1d42760e9b36a8e4cc1772eed505495f7 (diff)
parent8432378f2c07280feae0dd84f596a8c0ae96f2ca (diff)
Merge branch 'joeyconfig'
-rw-r--r--config-joey.hs1
-rw-r--r--debian/changelog1
-rw-r--r--src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs13
-rw-r--r--src/wrapper.hs2
4 files changed, 11 insertions, 6 deletions
diff --git a/config-joey.hs b/config-joey.hs
index 63768eeb..2c73b3e5 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/debian/changelog b/debian/changelog
index b8db1680..b7303cb3 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 <joeyh@debian.org> Sat, 07 Jun 2014 00:12:44 -0400
diff --git a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
index 57a6b084..8ef4f6ae 100644
--- a/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
+++ b/src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
@@ -98,14 +98,15 @@ 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
+ & 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 =
@@ -144,12 +145,13 @@ 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
-- 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
@@ -162,13 +164,14 @@ 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"]
& 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
diff --git a/src/wrapper.hs b/src/wrapper.hs
index f180e855..4d2c50fc 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)
--