Skip to content

Commit c8d3709

Browse files
committed
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 <[email protected]> (cherry picked from commit cb99f46)
1 parent 24fba48 commit c8d3709

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docker/base/Dockerfile.j2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
326326
] %}
327327

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

0 commit comments

Comments
 (0)