diff options
| author | Maksim Malchuk <maksim.malchuk@gmail.com> | 2021-12-22 10:45:58 +0300 |
|---|---|---|
| committer | Maksim Malchuk <maksim.malchuk@gmail.com> | 2021-12-28 11:02:25 +0000 |
| commit | cb99f46929298f8e1d939cfca2a1d4831cd1efca (patch) | |
| tree | bf5e62955f38129d03a3fc4abe5eed317478c3bc | |
| parent | 7893306addf97084250923ea88cd4b4be62677b8 (diff) | |
| download | kolla-cb99f46929298f8e1d939cfca2a1d4831cd1efca.tar.gz kolla-cb99f46929298f8e1d939cfca2a1d4831cd1efca.zip | |
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>
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b738fffe0..c07920194 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -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 %} \ |