summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess2015-06-09 17:09:09 -0400
committerJoey Hess2015-06-09 17:09:09 -0400
commit723f47d1ac6ebaddbe8df112a4b12ce7520dc89a (patch)
tree76c314d8d1746b792c083337b3dbe7a55eefdb9f
parentfd83259d8c636ac23478555a9ddbfa4e95fdf416 (diff)
parent9415bfb4adb61dedfc1301ff0bc7310cec40455a (diff)
Merge branch 'joeyconfig'
-rw-r--r--config-joey.hs4
-rw-r--r--debian/changelog6
-rw-r--r--propellor.cabal2
-rw-r--r--src/Propellor/Property/Docker.hs6
4 files changed, 13 insertions, 5 deletions
diff --git a/config-joey.hs b/config-joey.hs
index dec2701b..f791ed38 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -133,10 +133,10 @@ orca = standardSystem "orca.kitenet.net" Unstable "amd64"
& Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
GitAnnexBuilder.standardAutoBuilder
- (System (Debian Testing) "amd64") fifteenpast "2h")
+ (System (Debian Unstable) "amd64") fifteenpast "2h")
& Systemd.nspawned (GitAnnexBuilder.autoBuilderContainer
GitAnnexBuilder.standardAutoBuilder
- (System (Debian Testing) "i386") fifteenpast "2h")
+ (System (Debian Unstable) "i386") fifteenpast "2h")
& Systemd.nspawned (GitAnnexBuilder.androidAutoBuilderContainer
(Cron.Times "1 1 * * *") "3h")
where
diff --git a/debian/changelog b/debian/changelog
index f4459a2c..2441f4ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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,
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,
respectively. They also continue to accept Strings, for backwards
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
diff --git a/propellor.cabal b/propellor.cabal
index 9edc1436..d09e7590 100644
--- a/propellor.cabal
+++ b/propellor.cabal
@@ -1,5 +1,5 @@
Name: propellor
-Version: 2.4.0
+Version: 2.5.0
Cabal-Version: >= 1.6
License: BSD3
Maintainer: Joey Hess <id@joeyh.name>
diff --git a/src/Propellor/Property/Docker.hs b/src/Propellor/Property/Docker.hs
index 1dcc3522..d3e60fc2 100644
--- a/src/Propellor/Property/Docker.hs
+++ b/src/Propellor/Property/Docker.hs
@@ -34,6 +34,7 @@ module Propellor.Property.Docker (
memory,
cpuShares,
link,
+ environment,
ContainerAlias,
restartAlways,
restartOnFailure,
@@ -348,6 +349,11 @@ restartOnFailure (Just n) = runProp "restart" ("on-failure:" ++ show n)
restartNever :: Property HasInfo
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
-- on which it's deployed.
data ContainerId = ContainerId