summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config-joey.hs4
-rw-r--r--debian/changelog8
-rw-r--r--doc/news/version_1.3.0.mdwn17
-rw-r--r--doc/news/version_2.5.0.mdwn28
-rw-r--r--propellor.cabal2
-rw-r--r--src/Propellor/Property/Docker.hs6
6 files changed, 42 insertions, 23 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..6e641881 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)
@@ -23,9 +23,11 @@ propellor (2.5.0) UNRELEASED; urgency=medium
(API change)
* Docker: volume and publish accept Bound FilePath and Bound Port,
respectively. They also continue to accept Strings, for backwards
- compatability.
+ compatibility.
+ * 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/doc/news/version_1.3.0.mdwn b/doc/news/version_1.3.0.mdwn
deleted file mode 100644
index 87abb2f7..00000000
--- a/doc/news/version_1.3.0.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-propellor 1.3.0 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
- * --spin checks if the DNS matches any configured IP address property
- of the host, and if not, sshes to the host by IP address.
- * Detect #774376 and refuse to use docker if the system is so broken
- that docker exec doesn't enter a chroot.
- * Update intermediary propellor in --spin --via
- * Added support for DNSSEC.
- * Ssh.hostKey and Ssh.hostKeys no longer install public keys from
- the privdata. Instead, the public keys are included in the
- configuration. (API change)
- * Ssh.hostKeys now removes any host keys of types that the host is not
- configured to have.
- * sshPubKey is renamed to Ssh.pubKey, and has an added SshKeyType
- parameter. (API change)
- * CloudAtCost.deCruft no longer forces randomHostKeys.
- * Fix build with process 1.2.1.0."""]] \ No newline at end of file
diff --git a/doc/news/version_2.5.0.mdwn b/doc/news/version_2.5.0.mdwn
new file mode 100644
index 00000000..5c481d0e
--- /dev/null
+++ b/doc/news/version_2.5.0.mdwn
@@ -0,0 +1,28 @@
+propellor 2.5.0 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * cmdProperty' renamed to cmdPropertyEnv to make way for a new,
+ more generic cmdProperty' (API change)
+ * Add docker image related properties.
+ Thanks, Antoine Eiche.
+ * Export CommandParam, boolSystem, safeSystem, shellEscape, and
+ * createProcess from Propellor.Property.Cmd, so they are available
+ for use in constricting your own Properties when using propellor
+ as a library.
+ * Improve enter-machine scripts for systemd-nspawn containers to unset most
+ environment variables.
+ * Fix Postfix.satellite bug; the default relayhost was set to the
+ domain, not to smtp.domain as documented.
+ * Mount /proc inside a chroot before provisioning it, to work around #787227
+ * --spin now works when given a short hostname that only resolves to an
+ ipv6 address.
+ * Added publish property for systemd-spawn containers, for port publishing.
+ (Needs systemd version 220.)
+ * Added bind and bindRo properties for systemd-spawn containers.
+ * Firewall: Port was changed to a newtype, and the Port and PortRange
+ constructors of Rules were changed to DPort and DportRange, respectively.
+ (API change)
+ * Docker: volume and publish accept Bound FilePath and Bound Port,
+ respectively. They also continue to accept Strings, for backwards
+ compatibility.
+ * Docker: Added environment property.
+ Thanks Antoine Eiche."""]] \ No newline at end of file
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