Browse Source

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)
changes/55/823455/1
Maksim Malchuk 5 months ago committed by Mark Goddard
parent
commit
464d151753
  1. 6
      docker/base/Dockerfile.j2

6
docker/base/Dockerfile.j2

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

Loading…
Cancel
Save