From ac1ae843862ed7b39e953bfc5a9208b6ceb70b2a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 28 Sep 2022 13:59:33 +0200 Subject: centos: use Erlang 24 on AArch64 We do not have Erlang 25 for CentOS Stream 9 on AArch64 so we revert to use Erlang 24 from CentOS repository. Also synced Erlang and RabbitMQ versions between images. Change-Id: I1480de095eaea66c3a83a61ca3ff269953181e39 --- docker/base/Dockerfile.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 792863d03..2531b24a8 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -85,6 +85,7 @@ SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management {% set base_yum_repo_keys = [ 'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB', 'https://packages.treasuredata.com/GPG-KEY-td-agent', + 'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc', ] %} {% if base_arch == 'x86_64' %} @@ -96,7 +97,6 @@ SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management # 'crmsh.repo', {% set base_yum_repo_keys = base_yum_repo_keys + [ - 'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc', 'https://repos.influxdata.com/influxdb.key', ] %} {% elif base_arch == 'aarch64' %} @@ -163,6 +163,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-release-ceph-quincy', 'centos-release-nfv-openvswitch', 'centos-release-opstools', + 'centos-release-rabbitmq-38', 'epel-release', ] %} @@ -180,6 +181,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-ceph-quincy', 'centos-nfv-openvswitch', 'centos-opstools', + 'centos-rabbitmq-38', 'centos9-nfv-ovs', 'centos9-opstools', 'centos9-rabbitmq', -- cgit v1.2.3