Merge "Use APT pinning to set preferred version of RabbitMQ"
This commit is contained in:
commit
2ee796bdce
|
@ -0,0 +1,3 @@
|
|||
Package: rabbitmq-server
|
||||
Pin: version 3.7.10-1
|
||||
Pin-Priority: 1000
|
|
@ -47,17 +47,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
'libssl-dev',
|
||||
'libxslt1-dev',
|
||||
'mariadb-client',
|
||||
'python3-dev'
|
||||
] %}
|
||||
{% if base_distro == 'debian' %}
|
||||
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
|
||||
'python3-dev',
|
||||
'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")) }}
|
||||
|
||||
|
|
|
@ -22,18 +22,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||
{% elif base_package_type == 'deb' %}
|
||||
{% set rabbitmq_packages = [
|
||||
'erlang-nox',
|
||||
'logrotate'
|
||||
] %}
|
||||
|
||||
{% if base_distro == 'debian' %}
|
||||
{% set rabbitmq_packages = rabbitmq_packages + [
|
||||
'logrotate',
|
||||
'rabbitmq-server',
|
||||
] %}
|
||||
{% else %}
|
||||
{% set rabbitmq_packages = rabbitmq_packages + [
|
||||
'rabbitmq-server=3.7.10-1',
|
||||
] %}
|
||||
{% endif %}
|
||||
|
||||
{% if base_arch == 'aarch64' %}
|
||||
{% set rabbitmq_packages = rabbitmq_packages + [
|
||||
|
|
Loading…
Reference in New Issue