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>
(cherry picked from commit cb99f46929)
(cherry picked from commit c8d3709436)
This commit is contained in:
Maksim Malchuk 2021-12-22 10:45:58 +03:00 committed by Mark Goddard
parent d034341d50
commit 464d151753
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/base/Dockerfile.j2
View File

@ -361,7 +361,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'F77F1EDA57EBB1CC', 'F77F1EDA57EBB1CC',
'F6609E60DC62814E', 'F6609E60DC62814E',
] %} ] %}
{% set remote_apt_keys = [ {% set base_remote_apt_keys = [
'https://packages.grafana.com/gpg.key', 'https://packages.grafana.com/gpg.key',
'https://repos.influxdata.com/influxdb.key', 'https://repos.influxdata.com/influxdb.key',
] %} ] %}
@ -372,7 +372,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'F77F1EDA57EBB1CC', 'F77F1EDA57EBB1CC',
'F6609E60DC62814E', 'F6609E60DC62814E',
] %} ] %}
{% set remote_apt_keys = [ {% set base_remote_apt_keys = [
'https://download.docker.com/linux/debian/gpg', 'https://download.docker.com/linux/debian/gpg',
'https://packages.grafana.com/gpg.key', 'https://packages.grafana.com/gpg.key',
'http://buster-ussuri.debian.net/debian/dists/pubkey.gpg', 'http://buster-ussuri.debian.net/debian/dists/pubkey.gpg',
@ -392,7 +392,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{%- if not loop.last %} \ {%- if not loop.last %} \
{% endif -%} {% endif -%}
{% endfor %} {% 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 {% else %} && {% endif %}curl {{ key }} | apt-key add - {%- if loop.first %} RUN {% else %} && {% endif %}curl {{ key }} | apt-key add -
{%- if not loop.last %} \ {%- if not loop.last %} \
{% endif -%} {% endif -%}