openstack/kolla
Code Issues Proposed changes

base: drop Linaro OBS key for CentOS and Ubuntu

Browse Source 
Debian still needs it but it is enabled for all architectures.

Change-Id: I6a3ba599af3deedd450b4ffff6b86a0c04628340
This commit is contained in:
Marcin Juszkiewicz
2021-01-25 18:19:54 +01:00
parent dcdb04fd3a
commit f782157245
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docker/base/Dockerfile.j2
View File

@@ -97,7 +97,6 @@ COPY dnf.conf /etc/dnf/dnf.conf
{% set base_yum_repo_keys = [ {% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key', 'https://packages.grafana.com/gpg.key',
'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc', 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/centos7/repodata/repomd.xml.key',
] %} ] %}
# FIXME(mgoddard): Not available for CentOS 8 yet. # FIXME(mgoddard): Not available for CentOS 8 yet.
# #
@@ -356,11 +355,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'https://packages.grafana.com/gpg.key', 'https://packages.grafana.com/gpg.key',
'https://repos.influxdata.com/influxdb.key', 'https://repos.influxdata.com/influxdb.key',
] %} ] %}
{% if base_arch == 'aarch64' %}
{% set remote_apt_keys = remote_apt_keys + [
'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic/Release.key',
] %}
{% endif %}
{% elif base_distro == 'debian' %} {% elif base_distro == 'debian' %}
{% set base_apt_keys = [ {% set base_apt_keys = [
'46095ACC8548582C1A2699A9D27D666CD88E42B4', '46095ACC8548582C1A2699A9D27D666CD88E42B4',
@@ -374,11 +368,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key', 'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key',
'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc', 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
] %} ] %}
{% if base_arch == 'aarch64' %}
{% set remote_apt_keys = remote_apt_keys + [
'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key',
] %}
{% endif %}
{% set base_apt_packages = base_apt_packages + {% set base_apt_packages = base_apt_packages +
['sudo',] ['sudo',]
%} %}