From c0d7abc53221494ac6842627621679f6cea2930c Mon Sep 17 00:00:00 2001
From: Rodolfo Alonso <rodolfo.alonso.hernandez@intel.com>
Date: Mon, 7 Mar 2016 10:59:44 +0000
Subject: [PATCH] Add documentation for proxy buildargs picked from the
 environment.

Add documentation for the commit I084e5d1cc8f9993d65167878f9983ad58a68e86e.
Explain how 'build.py' picks up automatically env proxy variables.

Change-Id: Ia8513babd4ff72ed52e167b361d6b54393598a78
Closes-Bug: #1538108
---
 doc/image-building.rst | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/image-building.rst b/doc/image-building.rst
index 6e39d7b0f8..d451d91d39 100644
--- a/doc/image-building.rst
+++ b/doc/image-building.rst
@@ -267,6 +267,18 @@ Finally, pass them to the build script using the ``-i`` and ``-I`` flags:
 
     tools/build.py -i .header -I .footer
 
+Besides this configuration options, the script will automatically read these
+environment variables. If the host system proxy parameters match the ones
+going to be used, no other input parameters will be needed. These are the
+variables that will be picked up from the user env:
+
+::
+
+    HTTP_PROXY, http_proxy, HTTPS_PROXY, https_proxy, FTP_PROXY,
+    ftp_proxy, NO_PROXY, no_proxy
+
+Also these variables could be overwritten using ``--build-args``, which have
+precedence.
 
 .. _DockerBug: https://github.com/docker/docker/issues/6980
 .. _drivers: https://wiki.openstack.org/wiki/Neutron#Plugins