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

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2015-06-09 17:09:09 -04:00
parent fd83259d8c 9415bfb4ad
commit 723f47d1ac
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config-joey.hs
View File

@ -133,10 +133,10 @@ orca = standardSystem "orca.kitenet.net" Unstable "amd64"
& Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer & Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
GitAnnexBuilder.standardAutoBuilder GitAnnexBuilder.standardAutoBuilder
(System (Debian Testing) "amd64") fifteenpast "2h") (System (Debian Unstable) "amd64") fifteenpast "2h")
& Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer & Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
GitAnnexBuilder.standardAutoBuilder GitAnnexBuilder.standardAutoBuilder
(System (Debian Testing) "i386") fifteenpast "2h") (System (Debian Unstable) "i386") fifteenpast "2h")
& Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer & Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer
(Cron.Times "1 1 * * *") "3h") (Cron.Times "1 1 * * *") "3h")
where where

6
debian/changelog vendored
View File

@ -1,4 +1,4 @@
propellor (2.5.0) UNRELEASED; urgency=medium propellor (2.5.0) unstable; urgency=medium
* cmdProperty' renamed to cmdPropertyEnv to make way for a new, * cmdProperty' renamed to cmdPropertyEnv to make way for a new,
more generic cmdProperty' (API change) more generic cmdProperty' (API change)
@ -24,8 +24,10 @@ propellor (2.5.0) UNRELEASED; urgency=medium
* Docker: volume and publish accept Bound FilePath and Bound Port, * Docker: volume and publish accept Bound FilePath and Bound Port,
respectively. They also continue to accept Strings, for backwards respectively. They also continue to accept Strings, for backwards
compatability. compatability.
* Docker: Added environment property.
Thanks Antoine Eiche.
-- Joey Hess <id@joeyh.name> Thu, 07 May 2015 12:08:34 -0400 -- Joey Hess <id@joeyh.name> Tue, 09 Jun 2015 17:08:43 -0400
propellor (2.4.0) unstable; urgency=medium propellor (2.4.0) unstable; urgency=medium

2
propellor.cabal
View File

@ -1,5 +1,5 @@
Name: propellor Name: propellor
Version: 2.4.0 Version: 2.5.0
Cabal-Version: >= 1.6 Cabal-Version: >= 1.6
License: BSD3 License: BSD3
Maintainer: Joey Hess <id@joeyh.name> Maintainer: Joey Hess <id@joeyh.name>

6
src/Propellor/Property/Docker.hs
View File

@ -34,6 +34,7 @@ module Propellor.Property.Docker (
memory, memory,
cpuShares, cpuShares,
link, link,
environment,
ContainerAlias, ContainerAlias,
restartAlways, restartAlways,
restartOnFailure, restartOnFailure,
@ -348,6 +349,11 @@ restartOnFailure (Just n) = runProp "restart" ("on-failure:" ++ show n)
restartNever :: Property HasInfo restartNever :: Property HasInfo
restartNever = runProp "restart" "no" restartNever = runProp "restart" "no"
-- | Set environment variable with a tuple composed by the environment
-- variable name and its value.
environment :: (String, String) -> Property HasInfo
environment (k, v) = runProp "env" $ k ++ "=" ++ v
-- | A container is identified by its name, and the host -- | A container is identified by its name, and the host
-- on which it's deployed. -- on which it's deployed.
data ContainerId = ContainerId data ContainerId = ContainerId