diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2017-12-13 15:20:56 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2017-12-13 15:56:00 +0000 |
| commit | ebfc1e75127aff0d337c942a8d5626e45cd1ab05 (patch) | |
| tree | 4c4625f15a9b41dfac0046e766c4ae7901ce1add | |
| parent | 628af2f8b0dd413e9803d2c5973163dce4efa6f7 (diff) | |
| download | kolla-ebfc1e75127aff0d337c942a8d5626e45cd1ab05.tar.gz kolla-ebfc1e75127aff0d337c942a8d5626e45cd1ab05.zip | |
rabbitmq: handle Debian and aarch64 properly
Debian 'stretch' has rabbitmq-server 3.6.10 in backports repository so
we will use it instead of external version.
Also take care of 'erlang-base-hipe' (or rather lack of it) on AArch64
architecture.
Depends-on: I72d1d1c10cbc4c5fe0907e395b6d7c969353dff8
Change-Id: Id332215b1e05e6edf18efd85c4463993bb7b321f
| -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")) }} |
