diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-04-29 13:45:47 +0000 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-04-29 13:45:47 +0000 |
| commit | b5dbcb8dcd5266112405a05168ccbb12eb080c1a (patch) | |
| tree | c029bf73131e9bbd8122adc474df0ec54d665ca9 /docker | |
| parent | 0ec6049a73ef7e322c06ee0e7b8582e5e69b8815 (diff) | |
| download | kolla-b5dbcb8dcd5266112405a05168ccbb12eb080c1a.tar.gz kolla-b5dbcb8dcd5266112405a05168ccbb12eb080c1a.zip | |
Fix RabbitMQ and Erlang pins again
Change-Id: Ie5bacf5d76850e51aa5f20b34759f76f89f73a2c
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 86fd73ec6..4a95a27b8 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -13,21 +13,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block rabbitmq_install %} {% if base_package_type == 'rpm' %} + {% set rabbitmq_packages = [ 'hostname', - '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' %} |
