From 1c7bca966267867590207b8becb66599cd267d03 Mon Sep 17 00:00:00 2001
From: Doug Davis <dug@us.ibm.com>
Date: Thu, 25 Sep 2014 19:28:24 -0700
Subject: [PATCH] Add support for ENV of the form: ENV name=value ... still
 supports the old form: ENV name value

Also, fixed an issue with the parser where it would ignore lines
at the end of the Dockerfile that ended with \

Closes #2333

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 489d01ee7df3599750af3554e6fb8b0439a597b1
Component: cli
---
 .../cli/docs/sources/reference/builder.md     | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/components/cli/docs/sources/reference/builder.md b/components/cli/docs/sources/reference/builder.md
index 198e81cf8c..aac21b3272 100644
--- a/components/cli/docs/sources/reference/builder.md
+++ b/components/cli/docs/sources/reference/builder.md
@@ -337,11 +337,36 @@ expose ports to the host, at runtime,
 ## ENV
 
     ENV <key> <value>
+    ENV <key>=<value> ...
 
 The `ENV` instruction sets the environment variable `<key>` to the value
 `<value>`. This value will be passed to all future `RUN` instructions. This is
 functionally equivalent to prefixing the command with `<key>=<value>`
 
+The `ENV` instruction has two forms. The first form, `ENV <key> <value>`,
+will set a single variable to a value. The entire string after the first
+space will be treated as the `<value>` - including characters such as 
+spaces and quotes.
+
+The second form, `ENV <key>=<value> ...`, allows for multiple variables to 
+be set at one time. Notice that the second form uses the equals sign (=) 
+in the syntax, while the first form does not. Like command line parsing, 
+quotes and backslashes can be used to include spaces within values.
+
+For example:
+
+    ENV myName="John Doe" myDog=Rex\ The\ Dog \
+        myCat=fluffy
+
+and
+
+    ENV myName John Doe
+    ENV myDog Rex The Dog
+    ENV myCat fluffy
+
+will yield the same net results in the final container, but the first form 
+does it all in one layer.
+
 The environment variables set using `ENV` will persist when a container is run
 from the resulting image. You can view the values using `docker inspect`, and
 change them using `docker run --env <key>=<value>`.