diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-21 13:12:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-21 13:12:51 +0000 |
| commit | 45558924248fc8560c44295af8fb13c62fdebb0a (patch) | |
| tree | e3193bb9c471ad0d5a38b3b393bfd8a316102aec | |
| parent | aacde4a0de59c118550a2897b48621e9d8d82736 (diff) | |
| parent | c0c2076c856975e83a624eb793b586f2a4354a7f (diff) | |
| download | kolla-45558924248fc8560c44295af8fb13c62fdebb0a.tar.gz kolla-45558924248fc8560c44295af8fb13c62fdebb0a.zip | |
Merge "Add HTTP proxy support for fetching APT keys"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 8733d82c1..b738fffe0 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -344,12 +344,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 %} |