From 29bb43d53b611aa66d470c27550fae5cebced6ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Fri, 30 Apr 2021 18:41:11 +0000 Subject: [PATCH] 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 (cherry picked from commit 444313975e6099055c5573363eea8af5a035fdbd) --- docker/base/Dockerfile.j2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index baec98c392..90d2089a4e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -341,7 +341,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) #} {# A20F259AEB9C94BB -- Sensuapp (Freight) #} {# F1656F24C74CD1D8 -- MariaDB Signing Key #} - {# F77F1EDA57EBB1CC -- RabbitMQ Signing Key #} + {# F77F1EDA57EBB1CC -- Launchpad RabbitMQ Erlang PPA key #} + {# F6609E60DC62814E -- PackageCloud RabbitMQ repository key #} {% set base_apt_keys = [ '391A9AA2147192839E9DB0315EDB1B62EC4926EA', '46095ACC8548582C1A2699A9D27D666CD88E42B4', @@ -352,6 +353,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom 'A20F259AEB9C94BB', 'F1656F24C74CD1D8', 'F77F1EDA57EBB1CC', + 'F6609E60DC62814E', ] %} {% set remote_apt_keys = [ 'https://packages.grafana.com/gpg.key', @@ -361,6 +363,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',