Skip to content

Commit 0c20a44

Browse files
hrwyoctozepto
authored andcommitted
CentOS on AArch64 has only Erlang 22
RabbitMQ 3.8.14 is the last version with Erlang 22 support Change-Id: I1d68a47f78b925af76c44c61af7da1465371e721 (cherry picked from commit 0ec6049)
1 parent 3ee3c7d commit 0c20a44

File tree

2 files changed

+26
-4
lines changed

2 files changed

+26
-4
lines changed

docker/kolla-toolbox/Dockerfile.j2

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1717
{{ macros.enable_extra_repos(['rabbitmq', 'erlang']) }}
1818

1919
{% if base_package_type == 'rpm' %}
20+
2021
{% set kolla_toolbox_packages = [
2122
'crudini',
22-
'erlang-23.*',
2323
'gcc',
2424
'gdisk',
2525
'git',
@@ -34,9 +34,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
3434
'openssl-devel',
3535
'openvswitch',
3636
'python3-devel',
37-
'rabbitmq-server-3.8.*'
3837
] %}
3938

39+
{% if base_arch == 'aarch64' %}
40+
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
41+
'erlang-22.*',
42+
'rabbitmq-server-3.8.14'
43+
] %}
44+
{% else %}
45+
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
46+
'erlang-23.*',
47+
'rabbitmq-server-3.8.*'
48+
] %}
49+
{% endif %}
50+
4051
{% elif base_package_type == 'deb' %}
4152
{% set kolla_toolbox_packages = [
4253
'build-essential',

docker/rabbitmq/Dockerfile.j2

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
1313

1414
{% block rabbitmq_install %}
1515
{% if base_package_type == 'rpm' %}
16+
1617
{% set rabbitmq_packages = [
1718
'hostname',
18-
'erlang-23.*',
19-
'rabbitmq-server-3.8.*'
2019
] %}
2120

21+
{% if base_arch == 'aarch64' %}
22+
{% set rabbitmq_packages = rabbitmq_packages + [
23+
'erlang-22.*',
24+
'rabbitmq-server-3.8.14'
25+
] %}
26+
{% else %}
27+
{% set rabbitmq_packages = rabbitmq_packages + [
28+
'erlang-23.*',
29+
'rabbitmq-server-3.8.*'
30+
] %}
31+
{% endif %}
32+
2233
{% elif base_package_type == 'deb' %}
2334
{% set rabbitmq_packages = [
2435
'logrotate',

0 commit comments

Comments
 (0)