openstack
/
kolla
Code Issues Proposed changes

Add HTTP proxy support for fetching APT keys 

In network isolated environments the only way to go outside is through
HTTP proxy. Make use of it if set.

Co-authored-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Closes-Bug: #1850575
Change-Id: I2718884c4742cb81a3900e38fee62fbd27b472d7
This commit is contained in:
Yang Youseok 2019-10-30 14:35:14 +09:00 committed by Marcin Juszkiewicz
parent 077f13681c
commit c0c2076c85
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/base/Dockerfile.j2
View File

@ -343,12 +343,17 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{% block base_ubuntu_package_installation %}
{%- block base_ubuntu_package_key_installation %}
{% for key in base_apt_keys | customizable('apt_keys') %}
{%- if loop.first %}RUN mkdir -p /etc/kolla/apt-keys/{% endif %} && gpg --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 {{ key.keyid }} && gpg --export {{ key.keyid }} >/etc/kolla/apt-keys/{{ key.name }}.gpg
{%- if loop.first %}RUN mkdir -p /etc/kolla/apt-keys/{% endif %} \
&& gpg --keyserver hkp://keyserver.ubuntu.com:80 \
{% if env.http_proxy %} --keyserver-options "http-proxy={{ env.http_proxy }}" {% endif %}\
--recv-keys {{ key.keyid }} \
&& gpg --export {{ key.keyid }} >/etc/kolla/apt-keys/{{ key.name }}.gpg
{%- if not loop.last %} \
{% endif -%}
{% endfor %}
{% for key in remote_apt_keys | customizable('remote_apt_keys') %}
{%- if loop.first %} RUN mkdir -p /etc/kolla/apt-keys/ {% endif %} && curl {{ key.url }} -o /etc/kolla/apt-keys/{{ key.name }}.{{ key.type | default('asc') }}
{%- if loop.first %} RUN mkdir -p /etc/kolla/apt-keys/ {% endif %} \
&& curl {{ key.url }} -o /etc/kolla/apt-keys/{{ key.name }}.{{ key.type | default('asc') }}
{%- if not loop.last %} \
{% endif -%}
{% endfor %}