diff options
| author | Zuul <zuul@review.opendev.org> | 2022-10-27 15:09:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-10-27 15:09:55 +0000 |
| commit | 8fe9440f9511413c5aa7fa0be0a746dfc119dda0 (patch) | |
| tree | 8f27b9aaa590b17785309b0e1a2466e404bea535 /docker | |
| parent | 1da94b16f018440894f284f1011eae24ef568bbb (diff) | |
| parent | 3c70d5fc4e741e24123ac61c1a9b280492aa6a16 (diff) | |
| download | kolla-8fe9440f9511413c5aa7fa0be0a746dfc119dda0.tar.gz kolla-8fe9440f9511413c5aa7fa0be0a746dfc119dda0.zip | |
Merge "rabbitmq: use Erlang 25 on AArch64/CentOS/Rocky"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 14 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 8 |
2 files changed, 2 insertions, 20 deletions
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 = [ |