Merge pull request #1891 from rsmitty/proxy-fixes

Improved proxy support
This commit is contained in:
Spencer Smith
2017-10-31 14:32:12 -04:00
committed by GitHub
9 changed files with 32 additions and 12 deletions

View File

@@ -6,6 +6,11 @@
-v {{ helm_home_dir }}:{{ helm_home_dir }}:rw \
{% for dir in ssl_ca_dirs -%}
-v {{ dir }}:{{ dir }}:ro \
{% endfor -%}
{% endfor -%}
{% if http_proxy is defined or https_proxy is defined -%}
-e http_proxy="{{proxy_env.http_proxy}}" \
-e https_proxy="{{proxy_env.https_proxy}}" \
-e no_proxy="{{proxy_env.no_proxy}}" \
{% endif -%}
{{ helm_image_repo }}:{{ helm_image_tag}} \
"$@"