From 3c70d5fc4e741e24123ac61c1a9b280492aa6a16 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 24 Oct 2022 13:16:53 +0200 Subject: rabbitmq: use Erlang 25 on AArch64/CentOS/Rocky We switched repo to provide Erlang 25 but not switched to it. Change-Id: I8b0a2f27ccb3db61a38d8fe89676f99eed1e3d75 --- docker/kolla-toolbox/Dockerfile.j2 | 14 ++------------ docker/rabbitmq/Dockerfile.j2 | 8 -------- 2 files changed, 2 insertions(+), 20 deletions(-) (limited to 'docker') diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index cd19f5ecb..16029216d 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -17,19 +17,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} - {# 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 + [ + {% set kolla_toolbox_packages = [ 'crudini', + 'erlang-25.*', 'gcc', 'gdisk', 'git', diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index c059eeda8..93d524551 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -14,18 +14,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% 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