Skip to content

Commit 464d151

Browse files
mmalchukmarkgoddard
authored andcommitted
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) (cherry picked from commit c8d3709)
1 parent d034341 commit 464d151

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

docker/base/Dockerfile.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
361361
'F77F1EDA57EBB1CC',
362362
'F6609E60DC62814E',
363363
] %}
364-
{% set remote_apt_keys = [
364+
{% set base_remote_apt_keys = [
365365
'https://packages.grafana.com/gpg.key',
366366
'https://repos.influxdata.com/influxdb.key',
367367
] %}
@@ -372,7 +372,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
372372
'F77F1EDA57EBB1CC',
373373
'F6609E60DC62814E',
374374
] %}
375-
{% set remote_apt_keys = [
375+
{% set base_remote_apt_keys = [
376376
'https://download.docker.com/linux/debian/gpg',
377377
'https://packages.grafana.com/gpg.key',
378378
'http://buster-ussuri.debian.net/debian/dists/pubkey.gpg',
@@ -392,7 +392,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
392392
{%- if not loop.last %} \
393393
{% endif -%}
394394
{% endfor %}
395-
{% for key in remote_apt_keys | customizable('remote_apt_keys') %}
395+
{% for key in base_remote_apt_keys | customizable('remote_apt_keys') %}
396396
{%- if loop.first %} RUN {% else %} && {% endif %}curl {{ key }} | apt-key add -
397397
{%- if not loop.last %} \
398398
{% endif -%}

0 commit comments

Comments
 (0)