diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-12-12 20:25:51 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-12-12 20:25:51 +0100 |
| commit | d81e5f145b9e9366283172704ec72a6fecf067ec (patch) | |
| tree | ebf1da02713db647241efe186072d75847d622a4 | |
| parent | 3c3d567d33931213ac862e04a740bcf6d7e72c35 (diff) | |
| download | kolla-d81e5f145b9e9366283172704ec72a6fecf067ec.tar.gz kolla-d81e5f145b9e9366283172704ec72a6fecf067ec.zip | |
Use APT pinning to set preferred version of RabbitMQ
We want RabbitMQ 3.7.10-1 for Ubuntu. So set it in one place which is
designed for such things instead of doing it everytime we want to
install it.
Change-Id: Ib2b2d4e392aaf77bcdec24f9f5551cdf15d32d91
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 3 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 13 |
3 files changed, 7 insertions, 21 deletions
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index e69de29bb..8ee23861f 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -0,0 +1,3 @@ +Package: rabbitmq-server +Pin: version 3.7.10-1 +Pin-Priority: 1000 diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 3d699b58f..d4ad59f03 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -47,17 +47,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'libssl-dev', 'libxslt1-dev', 'mariadb-client', - 'python3-dev' + 'python3-dev', + 'rabbitmq-server', ] %} - {% if base_distro == 'debian' %} - {% set kolla_toolbox_packages = kolla_toolbox_packages + [ - 'rabbitmq-server', - ] %} - {% else %} - {% set kolla_toolbox_packages = kolla_toolbox_packages + [ - 'rabbitmq-server=3.7.10-1', - ] %} - {% endif %} {% endif %} {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index a667ee1da..ff17be7d0 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -22,19 +22,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_package_type == 'deb' %} {% set rabbitmq_packages = [ 'erlang-nox', - 'logrotate' + 'logrotate', + 'rabbitmq-server', ] %} - {% if base_distro == 'debian' %} - {% set rabbitmq_packages = rabbitmq_packages + [ - 'rabbitmq-server', - ] %} - {% else %} - {% set rabbitmq_packages = rabbitmq_packages + [ - 'rabbitmq-server=3.7.10-1', - ] %} - {% endif %} - {% if base_arch == 'aarch64' %} {% set rabbitmq_packages = rabbitmq_packages + [ 'erlang-base', |