diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-14 16:54:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-14 16:54:47 +0000 |
| commit | 9245418a240b8b65ebd994c6ff1494a9a397fc25 (patch) | |
| tree | fcf0568f1d6e527a35c2ed9eb6083f32337745a1 | |
| parent | cbbd938c1ae34977aad6339abc9cb198c56763b5 (diff) | |
| parent | ebfc1e75127aff0d337c942a8d5626e45cd1ab05 (diff) | |
| download | kolla-9245418a240b8b65ebd994c6ff1494a9a397fc25.tar.gz kolla-9245418a240b8b65ebd994c6ff1494a9a397fc25.zip | |
Merge "rabbitmq: handle Debian and aarch64 properly"
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index e7aba6de0..0a7c0ad68 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -17,13 +17,32 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_distro in ['debian', 'ubuntu'] %} {% set rabbitmq_packages = [ - 'erlang-base-hipe', 'erlang-nox', - 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb', 'logrotate', 'socat' ] %} + {% if base_distro == 'debian' %} + {% set rabbitmq_packages = rabbitmq_packages + [ + 'rabbitmq-server/stretch-backports' + ] %} + {% else %} + {% set rabbitmq_packages = rabbitmq_packages + [ + 'http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.5/rabbitmq-server_3.6.5-1_all.deb', + ] %} + {% endif %} + + {% if base_arch == 'aarch64' %} + {% set rabbitmq_packages = rabbitmq_packages + [ + 'erlang-base', + ] %} + {% else %} + {% set rabbitmq_packages = rabbitmq_packages + [ + 'erlang-base-hipe', + ] %} + + {% endif %} + {% endif %} {{ macros.install_packages(rabbitmq_packages | customizable("packages")) }} |