openstack
/
kolla
Code Issues Proposed changes

Fix variable name 

TrivialFix

The customization format of the variable name should contain the
<image_name> [1]. This change fixes the name of the 'remote_apt_keys'
variable in base Dockerfile.

1. https://docs.openstack.org/kolla/latest/admin/image-building.html#dockerfile-customisation

Change-Id: I423db39e77f337a73d3d88e3dbd56469be45110b
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
This commit is contained in:
Maksim Malchuk 2021-12-22 10:45:58 +03:00
parent 7893306add
commit cb99f46929
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@ -332,7 +332,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
] %}
{# NOTE(hrw): type field defaults to 'asc' which is used for single keys #}
{% set remote_apt_keys = [
{% set base_remote_apt_keys = [
{'name': 'elasticsearch', 'url': 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'},
{'name': 'grafana', 'url': 'https://packages.grafana.com/gpg.key'},
{'name': 'influxdb', 'url': 'https://repos.influxdata.com/influxdb.key'},
@ -352,7 +352,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{%- if not loop.last %} \
{% endif -%}
{% endfor %}
{% for key in remote_apt_keys | customizable('remote_apt_keys') %}
{% for key in base_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 not loop.last %} \