openstack
/
kolla
Code Issues Proposed changes

base debian/ubuntu: drop not needed APT keys 

Ubuntu: we dropped external MySQL repo months ago.

Debian: we dropped most of external repos when we moved to 'stretch'.

Also replaced Elasticsearch repo key with full id.

Change-Id: I679bd814b143d128f334c76d5ec7cc2dbe06543d
This commit is contained in:
Marcin Juszkiewicz 2018-10-23 12:22:33 +02:00
parent 7776b44cec
commit 0cdfa0c8ca
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/base/Dockerfile.j2
View File

@ -307,7 +307,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
{% if base_distro == 'ubuntu' %}
{# 05CE15085FC09D18E99EFB22684A14CF2582E0C5 -- InfluxDB Packaging Service <support@influxdb.com> #}
{# 177F4010FE56CA3336300305F1656F24C74CD1D8 -- MariaDB Signing Key <signing-key@mariadb.org> #}
{# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #}
{# 418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB -- packagecloud ops (production key) <ops@packagecloud.io> #}
{# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #}
@ -319,7 +318,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
{# A20F259AEB9C94BB -- Sensuapp (Freight) <support@hw-ops.com> #}
{% set base_apt_keys = [
'05CE15085FC09D18E99EFB22684A14CF2582E0C5',
'177F4010FE56CA3336300305F1656F24C74CD1D8',
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
'418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
@ -335,17 +333,12 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
] %}
{% elif base_distro == 'debian' %}
{% set base_apt_keys = [
'58118E89F3A912897C070ADBF76221572C52609D',
'0xcbcb082a1bb943db',
'D27D666CD88E42B4',
'05CE15085FC09D18E99EFB22684A14CF2582E0C5',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
'418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
'901F9177AB97ACBE',
] %}
{% set remote_apt_keys = [
'http://obs.linaro.org/ERP:/18.06/Debian_9/Release.key',
'https://download.docker.com/linux/debian/gpg',
'https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey'
] %}
{% set base_apt_packages = base_apt_packages +
['sudo',]