From 4c7c177e4ea4a166e656306e1d845cdb9e2f37ce Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Mon, 6 May 2013 18:54:27 -0700
Subject: [PATCH] Add the ENV instruciton to the docker builder documentation

---
 docs/sources/builder/basics.rst | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/sources/builder/basics.rst b/docs/sources/builder/basics.rst
index 2282cccf29..0d726e93c1 100644
--- a/docs/sources/builder/basics.rst
+++ b/docs/sources/builder/basics.rst
@@ -66,7 +66,16 @@ It is equivalent to do `docker commit -run '{"Cmd": <command>}'` outside the bui
 The `EXPOSE` instruction sets ports to be publicly exposed when running the image.
 This is equivalent to do `docker commit -run '{"PortSpecs": ["<port>", "<port2>"]}'` outside the builder.
 
-2.6 INSERT
+2.6 ENV
+-------
+    ``ENV <key> <value>``
+
+The `ENV` instruction set as environment variable `<key>` with the value `<value>`. This value will be passed to all future ``RUN`` instructions.
+
+.. note::
+    The environment variables are local to the Dockerfile, they will not be set as autorun.
+
+2.7 INSERT
 ----------
 
     ``INSERT <file url> <path>``