diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-13 10:59:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-13 10:59:19 +0000 |
| commit | 2ee796bdce78aadaeaf42796a4f4dce9e7471ce0 (patch) | |
| tree | 0a4872b0f1ebb2ed825a8ba12ce17bc5bded19e7 /docker | |
| parent | 69e1118c4f9f4cf945db6da1dffe1ab22cc1cfbe (diff) | |
| parent | d81e5f145b9e9366283172704ec72a6fecf067ec (diff) | |
| download | kolla-2ee796bdce78aadaeaf42796a4f4dce9e7471ce0.tar.gz kolla-2ee796bdce78aadaeaf42796a4f4dce9e7471ce0.zip | |
Merge "Use APT pinning to set preferred version of RabbitMQ"
Diffstat (limited to 'docker')
| -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', |