From ac1ae843862ed7b39e953bfc5a9208b6ceb70b2a Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
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 +++-
 docker/kolla-toolbox/Dockerfile.j2 | 20 +++++++++++++-------
 docker/rabbitmq/Dockerfile.j2      | 13 ++++++++-----
 3 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'docker')

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',
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 20822738b..db29c24e2 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -13,17 +13,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='ansible') }}
 {{ macros.configure_user(name='rabbitmq') }}
 
-{% if base_arch == 'aarch64' %}
-{{ macros.enable_extra_repos(['epel']) }}
-{% endif %}
-
 {{ macros.enable_extra_repos(['crb', 'erlang', 'openvswitch', 'rabbitmq']) }}
 
 {% if base_package_type == 'rpm' %}
 
-    {% set kolla_toolbox_packages = [
+    {# NOTE(hrw): we do not have Erlang 25 packages for AArch64 yet. #}
+    {% if base_arch == 'aarch64' %}
+        {% set kolla_toolbox_packages = [
+            'erlang-24.*',
+        ] %}
+    {% else %}
+        {% set kolla_toolbox_packages = [
+            'erlang-25.*',
+        ] %}
+    {% endif %}
+
+    {% set kolla_toolbox_packages = kolla_toolbox_packages + [
         'crudini',
-        'erlang-24.*',
         'gcc',
         'gdisk',
         'git',
@@ -36,7 +42,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'openssl-devel',
         'openvswitch',
         'python3-devel',
-        'rabbitmq-server-3.9.*'
+        'rabbitmq-server-3.10.*'
     ] %}
 
 {% elif base_package_type == 'deb' %}
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 7d524df68..c059eeda8 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -9,20 +9,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='rabbitmq') }}
 
-{# NOTE(hrw): erlang packages from Erlang Solutions needs libwx from EPEL #}
-{% if base_arch == 'aarch64' %}
-{{ macros.enable_extra_repos(['epel']) }}
-{% endif %}
-
 {{ macros.enable_extra_repos(['crb', 'erlang', 'rabbitmq']) }}
 
 {% block rabbitmq_install %}
 {% if base_package_type == 'rpm' %}
 
+{# NOTE(hrw): we do not have Erlang 25 packages for AArch64 yet. #}
+{% if base_arch == 'aarch64' %}
+    {% set rabbitmq_packages = [
+        'erlang-24.*',
+        'rabbitmq-server-3.10.*'
+    ] %}
+{% else %}
     {% set rabbitmq_packages = [
         'erlang-25.*',
         'rabbitmq-server-3.10.*'
     ] %}
+{% endif %}
 
 {% elif base_package_type == 'deb' %}
     {% set rabbitmq_packages = [
-- 
cgit v1.2.3