Browse Source

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 0ec6049a73)
changes/15/788615/2
Marcin Juszkiewicz 2 weeks ago
committed by Radosław Piliszek
parent
commit
0c20a44f9a
2 changed files with 26 additions and 4 deletions
  1. +13
    -2
      docker/kolla-toolbox/Dockerfile.j2
  2. +13
    -2
      docker/rabbitmq/Dockerfile.j2

+ 13
- 2
docker/kolla-toolbox/Dockerfile.j2 View File

@ -17,9 +17,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.enable_extra_repos(['rabbitmq', 'erlang']) }}
{% if base_package_type == 'rpm' %}
{% set kolla_toolbox_packages = [
'crudini',
'erlang-23.*',
'gcc',
'gdisk',
'git',
@ -34,9 +34,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openssl-devel',
'openvswitch',
'python3-devel',
'rabbitmq-server-3.8.*'
] %}
{% if base_arch == 'aarch64' %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'erlang-22.*',
'rabbitmq-server-3.8.14'
] %}
{% else %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'erlang-23.*',
'rabbitmq-server-3.8.*'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set kolla_toolbox_packages = [
'build-essential',


+ 13
- 2
docker/rabbitmq/Dockerfile.j2 View File

@ -13,12 +13,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block rabbitmq_install %}
{% if base_package_type == 'rpm' %}
{% set rabbitmq_packages = [
'hostname',
'erlang-23.*',
'rabbitmq-server-3.8.*'
] %}
{% if base_arch == 'aarch64' %}
{% set rabbitmq_packages = rabbitmq_packages + [
'erlang-22.*',
'rabbitmq-server-3.8.14'
] %}
{% else %}
{% set rabbitmq_packages = rabbitmq_packages + [
'erlang-23.*',
'rabbitmq-server-3.8.*'
] %}
{% endif %}
{% elif base_package_type == 'deb' %}
{% set rabbitmq_packages = [
'logrotate',


Loading…
Cancel
Save