Skip to content

Commit 29bb43d

Browse files
committed
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 4443139)
1 parent 0c20a44 commit 29bb43d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

docker/base/Dockerfile.j2

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
341341
{# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <[email protected]> #}
342342
{# A20F259AEB9C94BB -- Sensuapp (Freight) <[email protected]> #}
343343
{# F1656F24C74CD1D8 -- MariaDB Signing Key <[email protected]> #}
344-
{# F77F1EDA57EBB1CC -- RabbitMQ Signing Key <[email protected]> #}
344+
{# F77F1EDA57EBB1CC -- Launchpad RabbitMQ Erlang PPA key #}
345+
{# F6609E60DC62814E -- PackageCloud RabbitMQ repository key #}
345346
{% set base_apt_keys = [
346347
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
347348
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
@@ -352,6 +353,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
352353
'A20F259AEB9C94BB',
353354
'F1656F24C74CD1D8',
354355
'F77F1EDA57EBB1CC',
356+
'F6609E60DC62814E',
355357
] %}
356358
{% set remote_apt_keys = [
357359
'https://packages.grafana.com/gpg.key',
@@ -361,6 +363,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
361363
{% set base_apt_keys = [
362364
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
363365
'F77F1EDA57EBB1CC',
366+
'F6609E60DC62814E',
364367
] %}
365368
{% set remote_apt_keys = [
366369
'https://download.docker.com/linux/debian/gpg',

0 commit comments

Comments
 (0)