diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-08 03:50:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-08 03:50:22 +0000 |
| commit | d1f6d0dee507d5ab1f8d4d866353630980a9c56e (patch) | |
| tree | 7c82595457ff12a695023b432430b3cc292b78b2 /doc | |
| parent | 4d0fb0b7f6c31c0156229dbee6762f027b60fc51 (diff) | |
| parent | c0d7abc53221494ac6842627621679f6cea2930c (diff) | |
| download | kolla-d1f6d0dee507d5ab1f8d4d866353630980a9c56e.tar.gz kolla-d1f6d0dee507d5ab1f8d4d866353630980a9c56e.zip | |
Merge "Add documentation for proxy buildargs picked from the environment."
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/image-building.rst | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/image-building.rst b/doc/image-building.rst index 6e39d7b0f..d451d91d3 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 |