aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2021-04-30 18:41:11 +0000
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2021-04-30 18:41:11 +0000
commit444313975e6099055c5573363eea8af5a035fdbd (patch)
tree6f07ebc9e9926c29ddc8f1810a42b276fae4b772 /docker
parentb5dbcb8dcd5266112405a05168ccbb12eb080c1a (diff)
downloadkolla-444313975e6099055c5573363eea8af5a035fdbd.tar.gz
kolla-444313975e6099055c5573363eea8af5a035fdbd.zip
Install RabbitMQ repo key on Ubuntu and Debian
It was missed previously. CI did not detect it because it ignores apt security issues. That gets fixed in Ic5abc4b87fd76f87aba383abf43e95ba70629fcb Change-Id: I11256c674c42e35496146ff64fee1e8e04c30d2c
Diffstat (limited to 'docker')
-rw-r--r--docker/base/Dockerfile.j25
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 6c5d9df83..ddc67e3cd 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -371,7 +371,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #}
{# A20F259AEB9C94BB -- Sensuapp (Freight) <support@hw-ops.com> #}
{# F1656F24C74CD1D8 -- MariaDB Signing Key <signing-key@mariadb.org> #}
- {# F77F1EDA57EBB1CC -- RabbitMQ Signing Key <info@rabbitmq.com> #}
+ {# F77F1EDA57EBB1CC -- Launchpad RabbitMQ Erlang PPA key #}
+ {# F6609E60DC62814E -- PackageCloud RabbitMQ repository key #}
{% set base_apt_keys = [
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
@@ -382,6 +383,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'A20F259AEB9C94BB',
'F1656F24C74CD1D8',
'F77F1EDA57EBB1CC',
+ 'F6609E60DC62814E',
] %}
{% set remote_apt_keys = [
'https://packages.grafana.com/gpg.key',
@@ -391,6 +393,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
{% set base_apt_keys = [
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
'F77F1EDA57EBB1CC',
+ 'F6609E60DC62814E',
] %}
{% set remote_apt_keys = [
'https://download.docker.com/linux/debian/gpg',