diff options
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a87c91e08..fc55949ee 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -86,7 +86,7 @@ COPY dnf.conf /etc/dnf/dnf.conf 'https://artifacts.elastic.co/GPG-KEY-elasticsearch', 'https://packages.grafana.com/gpg.key', 'https://repos.influxdata.com/influxdb.key', - 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc', + 'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc', 'https://packages.treasuredata.com/GPG-KEY-td-agent', ] %} {% elif base_arch == 'aarch64' %} @@ -99,7 +99,7 @@ COPY dnf.conf /etc/dnf/dnf.conf {% set base_yum_repo_keys = [ 'https://packages.grafana.com/gpg.key', - 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc', + 'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc', ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. # @@ -359,6 +359,7 @@ 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> #} {% set base_apt_keys = [ '391A9AA2147192839E9DB0315EDB1B62EC4926EA', '46095ACC8548582C1A2699A9D27D666CD88E42B4', @@ -368,15 +369,16 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom '901F9177AB97ACBE', 'A20F259AEB9C94BB', 'F1656F24C74CD1D8', + 'F77F1EDA57EBB1CC', ] %} {% set remote_apt_keys = [ - 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc', 'https://packages.grafana.com/gpg.key', 'https://repos.influxdata.com/influxdb.key', ] %} {% elif base_distro == 'debian' %} {% set base_apt_keys = [ '46095ACC8548582C1A2699A9D27D666CD88E42B4', + 'F77F1EDA57EBB1CC', ] %} {% set remote_apt_keys = [ 'https://download.docker.com/linux/debian/gpg', @@ -385,7 +387,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom 'https://packages.treasuredata.com/GPG-KEY-td-agent', 'https://repos.influxdata.com/influxdb.key', 'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key', - 'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc', ] %} {% endif %} |